GunHog
|
834242b808
|
Fixes Abductor event
18,0000 deciseconds = 300 minutes, not 30!
|
2015-12-28 20:08:26 -06:00 |
|
AnturK
|
a8ed812584
|
Fixes Abductor event firing up multiple times
|
2015-12-10 19:29:10 +01:00 |
|
Tkdrg
|
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 |
|
Shadowlight213
|
c6971d35e9
|
Removes misc spaces
|
2015-10-18 15:36:22 -07:00 |
|
Shadowlight213
|
35ca96331e
|
Adds jobban support to syndicate borg
Adds jobban and pref checking to various events
Adds support for alien jobbans
Adds feedback to alien infestation event.
|
2015-10-18 15:25:14 -07:00 |
|
AnturK
|
d9073aefec
|
Makes blob event not happen during blob
Makes abductor event happen during gang,blob or cult
|
2015-09-05 23:07:32 +02:00 |
|
AnturK
|
cd7806818e
|
whoops
|
2015-09-05 20:16:22 +02:00 |
|