Commit Graph

157 Commits

Author SHA1 Message Date
Nerd Lord 7c183d448e Sleeping carp gang no longer has special interactions. 2016-02-13 18:17:01 -05:00
Bjorn Neergaard e750a06cde Remove old helper, fix tank dispenser icons. 2016-01-25 12:03:15 -06:00
duncathan salt 33ce734c03 Merge pull request #14404 from KorPhaeron/gang
Fixes gang implanter message
2016-01-05 22:18:26 -06:00
KorPhaeron 060fd8b529 Fixes gang implanter message 2016-01-04 20:22:24 -06:00
Nerd Lord c2a3be931b Adds a space after the ghost follow link for messages that lacked it 2016-01-04 19:26:07 -05:00
KorPhaeron b3b579c60c Adds Follow Links to everything 2016-01-03 01:33:16 -06:00
AndrewJacksonThe2nd 0d65351d3f fixes 2015-12-19 17:51:11 -08:00
PKPenguin321 40941c636d necklaces again
round three let's go
2015-12-16 20:47:00 -08:00
bgobandit 984582f6ba tweaks and shit 2015-12-10 15:48:22 -05:00
Bjorn Neergaard 8cc3a856a2 Add map_name to areas
Fixes #12713
2015-12-01 10:03:03 -06:00
Jordie fd96c313a7 Merge pull request #13248 from bgobandit/dominatorfix
Fixes dominator error message issue.
2015-11-29 21:08:38 +11:00
Remie Richards 08aee6ce4f Merge pull request #12965 from Shadowlight213/conversionbanfixes
Makes the conversion jobban replacement use the new antag flags
2015-11-27 20:02:45 +00:00
bgobandit 9df0dfe2c0 Fixes dominator error message issue. 2015-11-26 17:46:35 -05:00
AnturK 01eaa6901e Adds Dominators to PoI list 2015-11-19 21:04:32 +01:00
Shadowlight213 a7782e5b51 prefs 2015-11-12 22:56:07 -08:00
Shadowlight213 8401d79296 Makes the replacement proc use the new antag flag system.
Adds replacement for thralls.
2015-11-11 09:10:46 -08:00
KorPhaeron 130ab1f4cb Merge remote-tracking branch 'refs/remotes/tgstation/master' into jobbans
Conflicts:
	code/game/gamemodes/game_mode.dm
2015-11-09 00:29:41 -06:00
KorPhaeron 46da6c62c5 Preferences 2015-11-04 02:28:31 -06: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
KorPhaeron d26f642daf Jobbans 2015-11-01 03:36:01 -06:00
phil235 d3ee910211 Makes effect system code more OOP.
obj/effect/effect is now renamed obj/effect/particle_effect for better usability.
datum/effect/system and /datum/effect/effect/system are now both /datum/effect_system.
Fixes a bug where wall mounted igniters (and other spark producing objects) didn't produce sparks sometimes.
Moved explosion_particles.dm into the effect_system folder, because it has effect_systems code.
2015-10-21 23:28:29 +02:00
Swag McYolosteinen 3fee6a287c Merge pull request #12038 from KorPhaeron/gang
Implant Breaker Changes
2015-10-11 14:53:36 +02:00
KorPhaeron 076a49b877 15 points 2015-10-11 06:01:05 -05:00
KorPhaeron 9aaeb87e41 Deconverts 2015-10-11 06:00:01 -05:00
Remie Richards 97de4b2ebe Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/storage.dmi
2015-10-07 22:24:53 +01:00
Remie Richards b9394257da About a million changes, but largely: Functional (Sort of) Antag Huds, Mind fixes, and Final glue to get the mode working. 2015-10-07 22:11:19 +01:00
Xhuis 427700dfa5 Fixes projectile blocking 2015-10-04 01:17:22 -04:00
Xhuis 68f8ef243d Removes some debug code 2015-10-04 00:28:35 -04:00
Xhuis 1211ec4102 Some gang stuff 2015-10-04 00:26:26 -04:00
KorPhaeron 6c1307f093 Oops 2015-09-29 16:19:39 -07:00
KorPhaeron 9b7c31c0e0 Deconverts 2015-09-29 16:05:07 -07:00
Razharas ecea459b03 This is horrible and should be banned by geneva
This is horrible and should be banned by geneva
2015-09-29 04:38:37 +03:00
Razharas 85a4f85f2b Only spawn dominators in gang areas
Only spawn dominators in gang areas
2015-09-28 18:05:10 +03:00
KorPhaeron 4b9bdca45b Implant Breaker 2015-09-26 16:54:25 -05:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Razharas 5bf8c9dae5 Merge pull request #11512 from Jordie0608/thefirststeptoanyunificationisnaturallystatistics
Makes auto_declare_completion_ use printplayer()
2015-09-01 18:34:27 +03:00
Razharas bfbe4e997e Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE
Makes all Destroy() procs return properly
2015-09-01 15:54:18 +03:00
Razharas 8a6b41865e Merge pull request #10873 from ghost/chameleon
Chameleon Eyewear
2015-09-01 10:51:15 +03:00
Jordie0608 84a373ad90 makes auto_declare_completion_ use printplayer() 2015-08-31 20:55:12 +10:00
duncathan 51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
Ikarrus c14e5ce82e Gang Dominator Tweaks
- Fixes #11040 Made the beeping a bit quieter
- Fixes a case where you could activate the same dominator multiple times, wasting a domination attempt by mistake
2015-08-05 20:35:33 -06:00
Ikarrus 1573b89695 Gang Hotfix
Fixes runtime that prevents gangs from activating their dominators.
2015-08-04 19:27:16 -06:00
Jordie d5a88d3f98 Merge pull request #10957 from Core0verload/surgery-organs-implants
Implants, Surgery and Organs rework: Phase 1
2015-08-04 21:45:02 +10:00
Ikarrus e4b4b7db78 Centcom announcement comes before alert change 2015-07-31 22:10:08 -06:00
c0 04f7b3f2de Surgery, Implants and Organs rework: Phase 1 2015-07-31 22:18:31 +03:00
Cheridan a35770928d Merge pull request #10929 from Ikarrus/gangganggang
Gang Mode Fixes
2015-07-31 01:41:53 -05:00
Ikarrus 0b3a743d74 Added distinct lieutenant ranks
Fixed lieutenants being able to do what only bosses should do (Promote, recall)
2015-07-30 09:40:04 -06:00
Ikarrus 3ea9de5053 Territory Tagging Fix
Fixed needing to wait for the next payday before you can tag a territory that has it's old tag cleaned off.
2015-07-29 19:10:22 -06:00
Ikarrus 4aedc97e82 Adds Ending Cinematic for Gang Dominations
It basically flashes the SYSTEM OVERRIDE COMPLETE animation.
2015-07-28 20:21:52 -06:00
KorPhaeron 2bf89ef4be Chameleon Eyewear 2015-07-26 13:49:50 -05:00