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

1326 Commits

Author SHA1 Message Date
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
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
45d9ea57a7 Fixes fixing fire alarms (#996) 2017-05-18 12:06:22 -05:00
CitadelStationBot
04c79d28f9 Wizards are now at least 30 years old. Apprentices are 17 to 29. (#978) 2017-05-18 12:05:55 -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
f7c6489d87 Removes Mode.txt from repo. Cleans up loading code (#985) 2017-05-18 11:57:47 -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
Poojawa
54fcea8ca3 Nerfs Manifest Spirit #970 2017-05-18 11:37:42 -05:00
Poojawa
1c99f15389 Nerfs Manifest Spirit 2017-05-18 11:36:23 -05:00
CitadelStationBot
3f35592f4e Gang mode sync (#933) 
* Revert "Gang mode now calls a 4 minute shuttle once 60% of the crew is dead"

* gang fixes

* gang modernizations
 2017-05-18 11:33:37 -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
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
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
a681b306a6 [MIRROR] Buffs plasma and nerfs snow (#924) 
* Buffs plasma and nerfs snow

* Update mineral.dm

* Delete mineral.dm.rej
 2017-05-18 11:13:28 -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
30279b7f55 [MIRROR] Logs the round ID (#920) 
* Logs the round ID

* commit

* Update world.dm

* Delete world.dm.rej
 2017-05-18 09:06:25 -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
Poojawa
59b8cfbc93 Update cit_arousal.dm (#1027) 2017-05-18 08:38:46 -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
Poojawa
7a2560ee76 Delete gang_items.dm.rej 2017-05-18 08:07:48 -05:00
Poojawa
285bd5c9ff Delete dominator.dm.rej 2017-05-18 08:07:38 -05:00
LetterJay
0336b8c82f Merge pull request #922 from Citadel-Station-13/upstream-merge-27183 
[MIRROR] Dominators require an open space, except it works this time
 2017-05-18 09:02:54 -04: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
b8cbf1a056 [MIRROR] Makes some game options which should be flags flags (#910) 
* Makes some game options which should be flags flags

* Update configuration.dm

* Delete configuration.dm.rej
 2017-05-18 07:50:43 -05:00
CitadelStationBot
4a9ef49cf3 [MIRROR] Fixes SSShuttle not checking for missing arrivals (#908) 
* Fixes SSShuttle not checking for missing arrivals

* Update shuttle.dm

* Delete shuttle.dm.rej
 2017-05-18 07:34:31 -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