shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,856 Commits 5 Branches 0 Tags
b2e176346c33afbefeb744b4e88198d1ea9fe3aa
Commit Graph

116 Commits

Author SHA1 Message Date
CitadelStationBot
147bd4cf97 Lava is no longer a plating subtype (#2138) 2017-07-26 00:05:53 -07:00
CitadelStationBot
79fcbfece6 Charging the clockwork slab now uses overlays 2017-07-19 10:57:09 -05:00
CitadelStationBot
74e5f80257 Fixes the Ark not pushing stuff away even while waiting for components 2017-07-17 07:16:55 -05:00
CitadelStationBot
54da14ea6b Rename Bumped to CollidedWith (#2017) 2017-07-15 11:44:12 -07:00
CitadelStationBot
2d3905457e [MIRROR] Rename Bump to Collide (#2002) 
* Rename Bump to Collide

* Delete bubblegum.dm.rej

* Update bubblegum.dm
 2017-07-14 21:35:56 -07:00
CitadelStationBot
7c4b887551 Clockwork component icons for tgui will only be generated once (#1995) 2017-07-14 03:21:13 -07:00
LetterJay
9d3c4d4702 Merge pull request #1989 from Citadel-Station-13/upstream-merge-29215 
[MIRROR] Replaces ex_act and emp_act numbers with defines
 2017-07-13 23:57:35 -05:00
CitadelStationBot
55462ed7d1 Replaces ex_act and emp_act numbers with defines 2017-07-13 17:46:41 -05:00
CitadelStationBot
1da785ffb5 Removes old height parameter from CanPass proc 2017-07-13 17:46:36 -05:00
CitadelStationBot
f893863397 [MIRROR] Refactors speech/communication logging and adds coordinates to speech logs (#1905) 
* Refactors speech/communication logging and adds coordinates to speech logs

* Update clockwork_slab.dm

* Delete clockwork_slab.dm.rej

* Update browserOutput.dm

* Delete browserOutput.dm.rej
 2017-07-13 06:37:51 -07:00
CitadelStationBot
059e1ad46b Replaces clockwork component initials with icons (#1971) 2017-07-10 16:14:11 -07:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot
1b70c06474 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970) 2017-07-10 16:10:42 -07:00
CitadelStationBot
90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
CitadelStationBot
eb7f6c515b Cleans up posibrain code 2017-07-06 09:43:16 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
LetterJay
b75fee9f38 Merge branch 'master' into upstream-merge-28711 2017-07-03 17:47:00 -05:00
LetterJay
1054100178 Merge pull request #1447 from Citadel-Station-13/upstream-merge-28108 
[MIRROR] Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power
 2017-07-03 17:46:37 -05:00
LetterJay
694bf7a641 Update clockwork_slab.dm 2017-07-03 14:09:59 -05:00
LetterJay
08fd496450 Update clockwork_slab.dm 2017-07-03 12:02:32 -05:00
CitadelStationBot
5882b25b7a Rewrites Recollection and splits it into categories, rewords Hierophant Network description 2017-07-03 10:10:17 -05:00
LetterJay
d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
CitadelStationBot
989b991b05 Adds framework for equip delays and adds it to the straight jacket 2017-06-19 22:06:18 -05:00
LetterJay
42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
CitadelStationBot
7ad1ab9f0f Ratvar is no longer stopped by pathetic windows 2017-06-17 22:11:36 -05:00
CitadelStationBot
a090e33a15 Adds Prolonging Prism as an application scripture (#1472) 2017-06-17 13:31:04 -07:00
CitadelStationBot
9bd98194b2 Vomit fix 2017-06-16 15:19:26 -05:00
CitadelStationBot
3b5d55260a Fixes Geis counting dead servants 2017-06-15 19:55:41 -05:00
LetterJay
55d30f865b upstream-merge-28062 2017-06-12 12:20:07 -05:00
LetterJay
87ce1e1780 upstream-merge-28047 2017-06-11 08:39:38 -05:00
LetterJay
f5f4e3a9d1 upstream-merge-28047 2017-06-11 08:26:09 -05:00
LetterJay
4386813269 upstream-merge-27996 2017-06-11 02:17:53 -05:00
LetterJay
b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
LetterJay
06be53ffeb Merge pull request #1405 from Citadel-Station-13/upstream-merge-28049 
[MIRROR] Only human and silicon servants can help recite multi-invoker scriptures
 2017-06-09 09:13:18 -05:00
CitadelStationBot
ff53afcd99 Fixes clockwork armor bitflags 2017-06-09 03:26:59 -05:00
CitadelStationBot
d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
CitadelStationBot
92e3754bfb Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power 2017-06-07 03:06:26 -05:00
CitadelStationBot
4d25a6e299 Only human and silicon servants can help recite multi-invoker scriptures 2017-06-04 19:23:18 -05:00
CitadelStationBot
83b4c1d8d4 Adds round table to replace tacking some data in feedback table 2017-05-26 15:18:16 -05:00
CitadelStationBot
b42e5c8721 Fixes clock cultists not getting their "objective" 2017-05-24 16:15:47 -05:00
Poojawa
45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -05:00
CitadelStationBot
b943780a8c If ratvar is alive, turning clockwork floors into clockwork walls is fast 2017-05-19 06:25:19 -05:00
LetterJay
369edc07d2 Merge pull request #1044 from Citadel-Station-13/upstream-merge-27347 
[MIRROR] fixes ratvar shuttles
 2017-05-18 23:45:31 -04:00
CitadelStationBot
a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot
ef164ada86 fixes ratvar shuttles 2017-05-18 16:37:42 -05:00
CitadelStationBot
bbcc6f9be9 Proselytizing alloy shards will now proselytize all the shards in the tile 2017-05-18 16:37:26 -05:00
CitadelStationBot
b0760b9b33 Fixes not being able to cancel Geis and being able to cancel Volt Void (#998) 2017-05-18 12:07:02 -05:00
CitadelStationBot
a23a3b5cce Fixes clockwork obelisks (#997) 2017-05-18 12:06:46 -05:00
CitadelStationBot
e1729434d1 [MIRROR] Adds some antag alerts (#926) 
* Adds some antag alerts

* Add files via upload

* Delete ClockCult.ogg
 2017-05-18 11:27:52 -05:00
CitadelStationBot
c6a671a11b [MIRROR] Devil refactor+small revamp (#887) 
* Devil refactor+small revamp

* Delete mind.dm.rej

* clean up rej

* Delete admin_investigate.dm.rej

* Delete mapping.dm.rej

* compile fix
 2017-05-18 09:06:01 -05:00