shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,311 Commits 5 Branches 0 Tags
d2d9cd7fc2a80bc7d4e4e8a7f4df2c5fdf5149e0
Commit Graph

799 Commits

Author SHA1 Message Date
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
Robustin
685bf8b48c Both cult revive runes will now replace braindead/AFK cultists (#33206) 
* "Revive" AFKs

* "Revives" inactive clock cultists

* AFK boot notice

* Missing parenthesis

* Revive targets correct mob

* Poll fix

* Fixes inactive revive mob

* Suicide Counter
 2017-12-12 13:48:18 -06:00
swindly
1a15772c3a Makes swarmers check for mobs in objects (#33425) 2017-12-11 20:38:28 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
deathride58
57ab98d8bc Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152 
[MIRROR] Airlock Construction Update
 2017-12-10 23:49:51 +00:00
deathride58
216b0931d1 Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935 
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
 2017-12-10 22:43:58 +00:00
deathride58
a38ccf078b Update borer.dm 2017-12-10 16:59:46 -05:00
deathride58
7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
uraniummeltdown
d6b0683846 Airlock Construction Update 2017-12-10 15:23:34 -06:00
Jordan Brown
70be12aa1c Merge pull request #33241 from swindly/suicide 
Adds some suicide acts
 2017-12-09 15:52:53 -06:00
deathride58
742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization 
# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi
 2017-12-08 19:58:41 -05:00
deathride58
9715e9c685 Merge pull request #4232 from cebutris/borers 
Removes borer event from rotation
 2017-12-08 18:52:58 +00:00
deathride58
6432d2c86c Update slab_abilities.dm 2017-12-07 19:32:39 -05:00
Ashe Higgs
0ae0c44991 Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more 2017-12-06 16:37:15 -06:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
Trevor Serpas
f37df9f0b5 Ghost defile removes salt piles (#33294) 
Fixes #33291
 2017-12-06 06:19:17 -06:00
cebutris
50a4f85cbb removes it even harder 2017-12-05 16:03:03 -05:00
cebutris
701108d074 removes borer event from rotation 2017-12-05 15:56:23 -05:00
deathride58
f57e02ce95 Merge branch 'master' into donoritemmodularization 2017-12-04 20:17:02 -05:00
deathride58
858a9bf428 Merge pull request #4074 from Citadel-Station-13/upstream-merge-32624 
[MIRROR] [READY]Refactors uplinks to a component!
 2017-12-04 23:12:45 +00:00
deathride58
21d5e8999c Merge branch 'master' into upstream-merge-32624 2017-12-04 17:12:53 -05:00
deathride58
64aadb868e Merge branch 'master' into upstream-merge-33213 2017-12-04 21:39:30 +00:00
MoreRobustThanYou
29ba71765c Datumizes saymodes 2017-12-03 12:56:03 -06:00
Ashe Higgs
5621507b4a Adds emergency lights, built into light fixtures 2017-12-03 12:54:48 -06:00
AnturK
18c01d88c5 Fixes syndieborg spawner 2017-12-02 09:44:11 -06:00
deathride58
4eceef7693 Merge pull request #4155 from Citadel-Station-13/upstream-merge-32967 
[MIRROR] Added bot path data huds
 2017-11-30 04:34:25 +00:00
deathride58
34c9105396 Merge pull request #4165 from Citadel-Station-13/upstream-merge-33129 
[MIRROR] Adds a new wizard magic suicide.
 2017-11-29 03:29:37 +00:00
deathride58
5e2ca3235d Merge pull request #4160 from Citadel-Station-13/upstream-merge-33112 
[MIRROR] Fixes devilstuff
 2017-11-29 03:26:51 +00:00
Shadowflame909
5bc059fbc8 Update artefact.dm (#33129) 
Beep Beep more hard to get suicides are fun!
 2017-11-28 19:06:24 -06:00
Jordan Brown
87c16e3939 Merge pull request #33112 from AnturK/devilfix 
Fixes devilstuff
 2017-11-28 06:29:25 -06:00
Cruix
b23c92b056 Added bot path data huds 2017-11-28 06:28:40 -06:00
ACCount
b15481c7cd Removes some unused sprite files (#33121) 
* Removes two unused sprite files

* Removes two more sprites
 2017-11-28 06:28:23 -06:00
deathride58
1d8618eaca Merge pull request #4139 from Citadel-Station-13/upstream-merge-33090 
[MIRROR] Cleans up goldcore defines
 2017-11-27 03:11:42 +00:00
deathride58
c4b3b99c99 Merge pull request #4141 from Citadel-Station-13/upstream-merge-33087 
[MIRROR] Cleans up some qdel(src)'s in Initialize()
 2017-11-27 02:37:07 +00:00
ShizCalev
5abd1bcdd9 Cleans up some qdel(src)'s in Initialize() 2017-11-26 20:15:18 -06:00
AnturK
c574b06f90 Fixes wizard greentext (#33088) 2017-11-26 16:53:58 -06:00
ShizCalev
4a22fed89d Cleans up goldcore defines 2017-11-26 16:51:44 -06:00
deathride58
14ce7c8118 Merge pull request #4101 from Citadel-Station-13/upstream-merge-32994 
[MIRROR] Updates some item drops to use drop_location()
 2017-11-25 05:53:16 +00:00
ShizCalev
2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
ShizCalev
12aa356f10 Updates some item drops to use drop_location() 2017-11-24 12:59:33 -06:00
LetterJay
eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188 
[MIRROR] JSON feedback
 2017-11-22 18:42:34 -06:00
deathride58
b6630b41d1 merges #3877 proper 2017-11-22 17:37:22 -05:00
oranges
cec6c028f5 [READY]Refactors uplinks to a component! 2017-11-22 15:17:03 -06:00
KorPhaeron
ddddac262e Fixes blobbernaut spawning (#32954) 
* Fixes blobbernaut spawning

* There is no mob yet, we can't poll for it
 2017-11-21 22:27:49 -06:00
deathride58
0feca054da cleans up whitespace in traitor_bro.dm 2017-11-21 14:58:43 -05:00
deathride58
973be1b494 Update traitor_bro.dm 2017-11-21 14:56:41 -05:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
deathride58
2e210d08e1 Merge pull request #3639 from deathride58/IHAVENOIDEAWHATTHEFUCKIMDOING 
[READY] Redtext bug fix + Endround objective check cleanup
 2017-11-21 05:53:00 +00:00
deathride58
d2b251d23c Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844 
[MIRROR] Cleans up unused code
 2017-11-21 04:15:11 +00:00
AnturK
70c7996986 Fixes abductor teams getting assigned to same pod (#32859) 
* Fixes abductors getting assigned to same team

* Remove explicit null return
 2017-11-20 19:36:10 -06:00