8cd8d259ee
Merge pull request #11803 from RemieRichards/HandOfGod-Resurgence
...
Hand of God: Resurgence
2015-11-08 14:09:42 -06:00
09a506ef0f
Merge pull request #12877 from KorPhaeron/insert_tf2_joke
...
Allows golems to wear hats
2015-11-07 14:33:00 -06:00
8fce742d0a
Merge remote-tracking branch 'upstream/master' into fuk
...
Conflicts:
data/mode.txt
icons/mob/mob.dmi
icons/mob/suit.dmi
icons/obj/clothing/gloves.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/shoes.dmi
icons/obj/clothing/suits.dmi
2015-11-07 15:56:39 -03:00
d966c37c6a
Hand of God Fixes/Tweaks
...
Fixes healing fountain construction sprite.
Nexus are now destroyed properly.
Borged cultists will now lose antag status properly.
Round end message fixed.
Feedback messages improved to be clearer, and lots of typos fixed.
Smite no longer uses up faith if there is no valid target in the turf.
Adds an atom/attack_god() proc.
Fixes the greeting messages for prophets and followers, improves god msg.
Fixes nexus being spawned on dense turf after 2min, and general sanity.
Fixes attacking structures with abstract items.
Adds click delay and attack animation for attacking structures.
Fixes a lot more typos.
Fixes defense pylon friendly fire.
Makes defense pylon togglable on its god's click.
Cleans up gun_turret code a little in general.
Adds deconversion by loyalty implant or holy water (basically rev+cult).
Gods will now die when they have no followers left.
Adds the HoG gods to the traitor panel.
2015-11-07 15:25:28 -03:00
af411525dc
Merge pull request #12841 from KorPhaeron/ui
...
Swaps Guardian HUD button locations
2015-11-07 08:06:42 +03:00
3553509936
Merge pull request #12855 from AnturK/abdfix
...
Fixes advanced camera resets.
2015-11-07 08:06:11 +03:00
25f36bd158
Merge pull request #12869 from Menshin/clean_ghost_hud
...
Made new_player mobs use the base Login() proc
2015-11-07 06:35:52 +03:00
01f50fe4ff
Merge pull request #12861 from phil235/FixGibMorph
...
Fixes gibbed morph not dropping items.
2015-11-07 06:09:20 +03:00
13b7de40e9
Merge pull request #12842 from Jalleo/Lifecleanup
...
Cleans up copy pasted…
2015-11-07 06:08:46 +03:00
5e9ef18dad
Merge pull request #12868 from phil235/BloodcrawlSlimeBugFix
...
Fixes slimes not being detached from their victim when the victim starts bloodcrawling.
2015-11-07 06:07:57 +03:00
5e736281a7
Merge pull request #12871 from YotaXP/origin_tech_fix
...
Fixed bad `origin_tech` values.
2015-11-07 06:06:48 +03:00
0066670421
Merge pull request #12872 from Anonus/gtfoghost
...
Revenant Changes XVIII: You'd better be afraid of the ghost
2015-11-07 04:27:52 +03:00
4892c79a0d
Merge pull request #12862 from Robustin/master
...
Slows down nutrition loss in Slime People
2015-11-06 19:44:31 +03:00
4e85f49d8a
Hats
2015-11-06 01:54:14 -06:00
3f3994f549
Overload lights no longer shocks through walls.
2015-11-05 20:36:04 -05:00
0f23809346
Revenant changes XVIII
...
Made the abilities easier to tweak and somewhat less copypasta. They're still for() loops though.
Check the changelog for additional details.
2015-11-05 18:50:51 -05:00
d1337fa009
New_player mob now uses generic Login() proc
2015-11-05 23:50:42 +01:00
2ffc5f055c
Fixed bad origin_tech values.
2015-11-05 15:32:25 -05:00
aa848d0e4c
Update species_types.dm
2015-11-05 11:08:06 -05:00
31ad6964de
Fixes slimes not being detached from their victim when the victim starts bloodcrawling.
2015-11-05 16:56:11 +01:00
fdf869fa0f
Update species_types.dm
2015-11-04 17:24:28 -05:00
ed68f0bd1e
Merge pull request #12813 from KorPhaeron/xenobio_fixes
...
Xenobio console fixes
2015-11-04 23:42:09 +03:00
8ab8fa3767
Merge pull request #12819 from Incoming5643/slime_time_live
...
Little QoL thing for slimeperson splitting
2015-11-04 23:40:26 +03:00
9fae7a2174
Update species_types.dm
2015-11-04 15:40:08 -05:00
f31bb62839
Slime Persons no longer a death sentence, splitting viable
...
Two problems:
1) Being a slime person devoured your nutrition status and within a short period of time would have you on death's door. It took nearly 10 minutes of cryotherapy and food being shoved into my mouth to save my life as a slime person who never even got a nutrition starvation warning.
2) You will never have enough slime for splitting unless you have an odysseus copy your slime jelly and then shoot you full of needles with it.
This PR attempts to fix both issues by making the nutrient loss slower and the slime gain faster and capable of reaching 200 when you can split.
2015-11-04 14:59:13 -05:00
15781c8796
Fixes gibbed morph not dropping items. Butchering now drops all items instead of just 10 at a time.
2015-11-04 20:54:56 +01:00
119d719e30
Fixes the two runtimes that was caused by the change
2015-11-04 14:42:50 +00:00
d77ad7a6f5
Fixes advanced camera resets.
2015-11-04 15:08:17 +01:00
fb3bbbee9c
Merge pull request #12825 from xxalpha/resist
...
Fixed cyborgs not being able to unbuckle with alarm button
2015-11-03 23:05:59 -06:00
652e0114d7
Cleans up a tiny bit of changeling code that was copy pasted in monkey and human by merging it at carbon/life.dm
2015-11-03 22:50:51 +00:00
b2f6de33b7
swaps button locations
2015-11-03 15:31:03 -06:00
eed3116d43
Simple Animal Xeno Hunter Sprite Fix
...
- Fixes icon_state for simple mob alien hunter.
2015-11-02 19:19:33 -06:00
c313bd2c46
Fixed buckled, handcuffed and legcuffed alert buttons not calling resist.
2015-11-02 18:57:52 +00:00
c8b1fe81b5
I really need to stop coding at 3 am
2015-11-02 03:24:47 -05:00
9ffa8ed82c
Merge branch 'slime_time_live' of https://github.com/Incoming5643/-tg-station into slime_time_live
2015-11-02 03:08:39 -05:00
5020846729
Shifting between bodies can't be done while unconscious, so this keeps slimepeople from jumping to already unconscious bodies so no one gets blindly trapped
2015-11-02 03:07:39 -05:00
e2187614fd
Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts
...
Conflicts:
code/__DEFINES/hud.dm
code/__HELPERS/game.dm
code/_onclick/hud/_defines.dm
code/_onclick/hud/hud.dm
code/game/gamemodes/antag_spawner.dm
code/game/gamemodes/game_mode.dm
code/game/machinery/turrets.dm
code/modules/client/preferences_toggles.dm
code/modules/events/alien_infestation.dm
code/modules/mob/dead/observer/observer.dm
code/modules/mob/living/carbon/alien/special/alien_embryo.dm
code/modules/mob/living/simple_animal/revenant/revenant.dm
icons/mob/back.dmi
icons/mob/head.dmi
icons/mob/hud.dmi
icons/mob/inhands/items_lefthand.dmi
icons/mob/inhands/items_righthand.dmi
icons/mob/mob.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/items.dmi
icons/obj/projectiles.dmi
icons/obj/storage.dmi
2015-11-02 01:06:30 -03:00
e5f59edfae
Xenobio fixes
2015-11-01 21:05:06 -06:00
3e3aa2ee9f
Merge pull request #12748 from MrStonedOne/sweetsweetdimlight
...
[Pretty Pictures!] [map] Makes starlight have far spreading low levels of light rather than near spreading high levels of light.
2015-10-31 22:22:39 -05:00
122796dfb7
Merge pull request #12726 from MrPerson/delay_of_game_5_yard_penalty_repeat_first_down
...
Refactor mob movement delay calculation
2015-11-01 02:04:44 +03:00
615275f71f
Merge pull request #12496 from kingofkosmos/interactivescreenalerts
...
More interactive screen alerts and workarounds for the resist-button
2015-10-31 15:13:15 +03:00
1e3aa40015
Merge pull request #12714 from MrPerson/lastarea's_last_ride
...
Removes the unused lastarea mob var
2015-10-31 15:05:40 +03:00
8c755da84f
Adds a way to make certain area/space areas not force 100% brightness
2015-10-31 02:30:49 -07:00
3e8a47b40d
Merge pull request #12746 from Incoming5643/slime_time_live
...
Fixes an errant sanity check in slimeperson splitting
2015-10-31 18:52:53 +11:00
6e4400f366
Adds more random letters to posibrain.dm
2015-10-30 15:05:41 -04:00
edf65c7dcb
Merge pull request #12722 from MrStonedOne/patch-55
...
Update posibrain.dm
2015-10-30 12:30:06 -05:00
1855f1a35f
Merge pull request #12731 from Anonus/fleshbang
...
Revenants now have cool, revenant-y spanclasses
2015-10-30 12:27:33 -05:00
f3266a411c
Merge pull request #12661 from KorPhaeron/mudamudamuda
...
Parasite HUD and rebalancing
2015-10-30 05:19:07 +00:00
ceab30d9f0
Readability
2015-10-30 01:07:51 -04:00
4c2cd4b128
Hello my name is incoming and I fuck up sanity at the last possible moment
2015-10-30 00:38:24 -04:00
Cheridan
Tkdrg
Razharas
KorPhaeron
Nerd Lord
Menshin
YotaXP
Robustin
phil235
blah
AnturK
GunHog
xxalpha
Incoming5643
Incoming
KorPhaeron
MrStonedOne
Jordie
JJRcop
Remie Richards