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

882 Commits

Author SHA1 Message Date
LetterJay
af815195bc Merge pull request #1034 from Citadel-Station-13/upstream-merge-27368 
[MIRROR] Fixes bane runtimes
 2017-05-19 05:32:31 -04:00
LetterJay
2ad02addbd Merge pull request #1048 from Citadel-Station-13/upstream-merge-27335 
[MIRROR] Gives lavaland syndicates the syndicate faction.
 2017-05-18 23:46:30 -04:00
LetterJay
1b4d2b330f Merge pull request #1047 from Citadel-Station-13/upstream-merge-27343 
[MIRROR] Fixes custom slices not inheriting name
 2017-05-18 23:46:20 -04:00
LetterJay
038e804348 Merge pull request #1035 from Citadel-Station-13/upstream-merge-27241 
[MIRROR] Clowns get an automatic self-recharging pie cannon as a traitor item for 10TC
 2017-05-18 23:40:11 -04:00
LetterJay
740e5cab30 Merge pull request #1032 from Citadel-Station-13/upstream-merge-27370 
[MIRROR] Fixes obtaining blob chems
 2017-05-18 23:39:34 -04:00
LetterJay
cda7d68cd6 Merge pull request #1031 from Citadel-Station-13/upstream-merge-27234 
[MIRROR] [READY]Peacekeeper cyborg projectile dampening fields, attempt three
 2017-05-18 23:39:25 -04:00
CitadelStationBot
76c6a54d7e Gives lavaland syndicates the syndicate faction. 2017-05-18 16:37:57 -05:00
CitadelStationBot
fa1b651799 Fixes custom slices not inheriting name 2017-05-18 16:37:54 -05:00
CitadelStationBot
552433143e Clowns get an automatic self-recharging pie cannon as a traitor item for 10TC 2017-05-18 16:37:07 -05:00
CitadelStationBot
fe89b9ea8a Fixes bane runtimes 2017-05-18 16:37:02 -05:00
CitadelStationBot
0c0c1e378b Fixes obtaining blob chems 2017-05-18 16:36:54 -05:00
CitadelStationBot
36072177f9 [READY]Peacekeeper cyborg projectile dampening fields, attempt three 2017-05-18 16:36:50 -05:00
CitadelStationBot
d5b0150e99 Buffs hierophant club 2017-05-18 16:36:38 -05:00
CitadelStationBot
7a66ea60fb Space vines can no longer spread on transit turfs (#1026) 2017-05-18 13:18:48 -05:00
CitadelStationBot
3e26a2d60f Adds a proc for copying languages from another thing (#1021) 2017-05-18 13:18:04 -05:00
CitadelStationBot
e6a55a4131 Adds a really stupid syndicate bible, with a great sprite by JStheguy (#1017) 2017-05-18 12:41:30 -05:00
CitadelStationBot
fadbb378aa Adds Bonfire Grills (#1003) 2017-05-18 12:23:07 -05:00
CitadelStationBot
1b39381ee7 Ports radios to Initialize (#983) 2017-05-18 12:19:55 -05:00
CitadelStationBot
1da5a27b98 Adjusts ear/eye protection based on missing organs (#999) 2017-05-18 12:07:33 -05:00
CitadelStationBot
7d04404ae3 [MIRROR] Fixed tech disk exports (#971) 
* Fixed tech disk exports

* Update research.dm

* Delete research.dm.rej
 2017-05-18 11:59:06 -05:00
CitadelStationBot
f2c83f8ced SM speaks on engineering channel, now with 100% less freeze (#984) 2017-05-18 11:55:47 -05:00
CitadelStationBot
946013ac22 Fixes rcds working on transit space (#981) 2017-05-18 11:54:10 -05:00
CitadelStationBot
0ad1bb5259 Adds a disk slot to the ORM, to allow the uploading of new smelter designs (#980) 2017-05-18 11:53:47 -05:00
CitadelStationBot
acbaa45aee Adds a few new recipes created with plastic sheets (#979) 2017-05-18 11:53:17 -05:00
Poojawa
0419ef823b spells recharge fix. #976 2017-05-18 11:49:46 -05:00
Poojawa
2f0881c0b6 spells recharge fix. #976 2017-05-18 11:48:38 -05:00
CitadelStationBot
df9e22183d [MIRROR] Servant golems do not have special names (#939) 
* Servant golems do not have special names

* Update golems.dm
 2017-05-18 11:28:09 -05:00
CitadelStationBot
c61bb0476f [MIRROR] Cleans up some Initializes (#943) 
* Cleans up some Initializes

* Update farm_animals.dm

* Delete farm_animals.dm.rej

* Update farm_animals.dm
 2017-05-18 11:13:53 -05:00
CitadelStationBot
7a9e05e9d9 Cerestation Tweaks MK VII: BEES edition (#925) 2017-05-18 10:36:51 -05:00
CitadelStationBot
33941c29c8 [MIRROR] People can be cloned from heads or brains (#919) 
* People can be cloned from heads or brains

* .rej fixes

* Update cloning.dm
 2017-05-18 09:49:26 -05:00
CitadelStationBot
a317d23a51 [MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916) 
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie

* fixes .rej
 2017-05-18 09:37:30 -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
CitadelStationBot
4022281599 [MIRROR] Plasma golem tweaks (#906) 
* Plasma golem tweaks

* Update golems.dm

* Delete golems.dm.rej
 2017-05-18 08:08:34 -05:00
CitadelStationBot
423ce5ffbd [MIRROR] Canisters only notify admins if they contain a meaningful amount of dangerous gas when opened (#901) 
* Canisters only notify admins if they contain a meaningful amount of dangerous gas when opened

* Update canister.dm

* Delete canister.dm.rej
 2017-05-18 07:55:27 -05:00
CitadelStationBot
6617f68604 [MIRROR] Harvesters are more fun to play (#894) 
* Harvesters are more fun to play

* resolve .rej
 2017-05-18 07:12:29 -05:00
CitadelStationBot
6a2916a171 [MIRROR] Bluespace Launchpads (#879) 
* Bluespace Launchpads

* Delete runtimestation.dmm.rej

* Delete tgstation.dme.rej

* Delete tgui.js.rej

* Update tgui.js
 2017-05-18 07:12:13 -05:00
CitadelStationBot
30e18146e5 [MIRROR] Makes a thing use the right proc (#881) 
* Makes a thing use the right proc

* Delete IsBanned.dm.rej

* Update IsBanned.dm

* Update IsBanned.dm
 2017-05-18 06:51:42 -05:00
CitadelStationBot
eb359f1014 [MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876) 
* Cerestation Tweaks VI: Shuttle Edition

* fix .rej
 2017-05-18 06:51:26 -05:00
CitadelStationBot
ad65636014 [MIRROR] Fixes saying nothing when you have no language (#861) 
* Fixes saying nothing when you have no language

* fix .rej

* Update say.dm
 2017-05-18 06:12:39 -05:00
CitadelStationBot
43c05ad3da [MIRROR] Fixes status stat panel (#878) 
* Fixes status stat panel

* Update mob.dm

* Delete mob.dm.rej
 2017-05-18 06:12:18 -05:00
CitadelStationBot
2eea01f671 [MIRROR] Refactor of modular PC UIs (#874) 
* Refactor of modular PC UIs

* .rej fix
 2017-05-18 05:22:34 -05:00
CitadelStationBot
663fd8e671 [MIRROR] Fix a rogue proc declaration (#872) 
* Fix a rogue proc declaration

* Update admin_investigate.dm
 2017-05-18 05:16:57 -05:00
CitadelStationBot
6ec7f5c3e0 [MIRROR] Ports gibbers to Initialize (#870) 
* Ports gibbers to Initialize

* Update gibber.dm

* Delete gibber.dm.rej
 2017-05-18 05:16:36 -05:00
CitadelStationBot
f345d6a3ca [MIRROR] You can no longer bypass language restrictions with default language (#859) 
* You can no longer bypass language restrictions with default language

* resolve rej files

* Update language_menu.dm
 2017-05-18 05:05:19 -05:00
LetterJay
d40c2224c3 Merge pull request #624 from Citadel-Station-13/upstream-merge-26492 
[MIRROR] Adds new debug verb for highlighting roundstart ATs
 2017-05-18 05:51:54 -04:00
CitadelStationBot
ff9928fdd7 [MIRROR] Makes it clear whether (in)complete golem shells are free or servant (#857) 
* Makes it clear whether (in)complete golem shells are free or servant

* resolves rej file
 2017-05-18 04:40:12 -05:00
CitadelStationBot
2ee5ff82a2 [MIRROR] Adds a way to check related accounts by CID or IP in game (#863) 
* Adds a way to check related accounts by CID or IP in game

* resolve rej
 2017-05-18 04:20:49 -05:00
CitadelStationBot
8bcaa54cbe [MIRROR] Fixes language code ignoring holder restrictions (#858) 
* Fixes language code ignoring holder restrictions

* resolve .rej file.
 2017-05-18 04:13:57 -05:00
CitadelStationBot
4f971be3a9 [MIRROR] Golems do not have underclothing (#784) 
* Golems do not have underclothing

* Resolves .rej

* Update golems.dm

* Update golems.dm
 2017-05-18 03:53:14 -05:00
CitadelStationBot
47fa8353eb [MIRROR] Moves playsound_local() to mob and gets rid of a useless proc. (#710) 
* Moves playsound_local() to mob and gets rid of a useless proc.

* Fixes compile errors
 2017-05-18 01:39:16 -05:00