shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,094 Commits 5 Branches 0 Tags
79db3ba93d42e538de90fe10221dc45cebeabb64
Commit Graph

840 Commits

Author SHA1 Message Date
Jordan Brown
378d8b9c01 Merge pull request #35805 from DaedalusGame/walls-dont-break-to-space-robustin-you-smoothbrain-extraordinaire 
Fixes walls under doors breaking to space
 2018-02-19 22:07:26 -06:00
CitadelStationBot
1e65c813f0 [MIRROR] Extensive surgery additions (#5590) 
* Extensive surgery additions

* Update role_preferences.dm

* Update surgery_step.dm
 2018-02-19 10:48:11 -06:00
CitadelStationBot
58af563131 [MIRROR] Redeems my sins. Defib mount fixes. (#5588) 
* Redeems my sins. Defib mount fixes. (#35727)

* Never again

* stuff

* Bumps up the recharge.

* Redeems my sins. Defib mount fixes.
 2018-02-19 10:22:21 -06:00
fludd12
954bb7330e Sake! (#5538) 
* Sake!

🆑 Fel and LeonDuvall
add: You can now drink sake! Can be found in the bar, or made with rice
and sugar.
/🆑

Sprites and idea courtesy of LeonDuvall.
Can be made with 15u rice and 5u sugar at 400k.

* Does the thing

Modularization of vending machines would require a lot more effort than
is remotely worth for such a simple change. Fortunately, not a lot of
new alcohols are added to it often, so it should be fine.
 2018-02-18 19:26:55 -06:00
Poojawa
7d488e8f4c Citadel'd Maps from #5523 (#5551) 
* #5523 commit + sanity upload

* reee

* Syncs home brew CItadel changes

* updates cit_map_files

* reee.
 2018-02-17 18:04:28 -06:00
CitadelStationBot
b3266870a6 [MIRROR] Fixes some tool interactions (#5555) 
* Merge pull request #35724 from DaxDupont/bordlisten-loves-the-cocks

Fixes some tool interactions

* Fixes some tool interactions
 2018-02-17 17:46:46 -06:00
deathride58
f072def90e Merge pull request #5533 from Citadel-Station-13/upstream-merge-35673 
[MIRROR] All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals.
 2018-02-17 20:44:57 +00:00
deathride58
fc041fbb34 Merge pull request #5549 from Citadel-Station-13/upstream-merge-35732 
[MIRROR] fixes poddoor examine message
 2018-02-17 19:31:47 +00:00
deathride58
fb65a98117 Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668 
[MIRROR] Quote the armor lists
 2018-02-17 19:29:50 +00:00
yorii
f03905ebde fixes poddoor examine message (#35732) 
examining a blast door do longer gives the regular door examination about the maintenance panel.
 2018-02-17 13:16:53 -06:00
BordListian
dbdb29d913 - Makes lava not burn unconstructed heat-exhanging pipes (#35705) 2018-02-17 10:14:20 -06:00
Leo
a5650cccc4 All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals. 2018-02-16 12:18:21 -06:00
deathride58
a3180b0173 Merge pull request #5506 from Citadel-Station-13/upstream-merge-35431 
[MIRROR] html_interface removal and crew monitoring console refactor.
 2018-02-16 14:27:26 +00:00
LetterJay
8b2e073841 Update message_server.dm 2018-02-16 07:53:54 -06:00
AnturK
993f15a415 Converting more auto_custom antagonists. (#35484) 
* Thinning out auto_custom uses.

* Not sure what i was thinking.

* Not sure what happened here.

* Fixes

* Forgot i'm doing this so i can remove this

* C

* Valentine antag datums

* This is what i get for adding it manually.
 2018-02-16 00:45:20 -06:00
Jordan Brown
f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
deathride58
c1b3253b8d Merge pull request #5485 from Poojawa/cryopods 
Cryopods from Oracle Station
 2018-02-16 05:56:34 +00:00
LetterJay
14d387fa04 Merge pull request #5513 from Citadel-Station-13/upstream-merge-35542 
[MIRROR] Cleans up some duplicate canusetopic warnings
 2018-02-15 22:17:54 -06:00
deathride58
f664c21aee Merge pull request #5502 from Citadel-Station-13/upstream-merge-35586 
[MIRROR] Cleans up remnant traitor cyborg code and AI hacking.
 2018-02-16 03:04:35 +00:00
oranges
5dc3549801 Merge pull request #35542 from ShizCalev/free-spam-removal 
Cleans up some duplicate canusetopic warnings
 2018-02-15 20:35:03 -06:00
deathride58
05ab5f7c0c Merge pull request #5510 from Citadel-Station-13/upstream-merge-35552 
[MIRROR] [s]Fixes writing bugs/exploits
 2018-02-16 01:32:23 +00:00
deathride58
91a2c04f0d Update law.dm 2018-02-15 20:27:36 -05:00
ShizCalev
98bbfb8709 [s]Fixes writing bugs/exploits 2018-02-15 16:10:03 -06:00
AnturK
35b8e410be html_interface removal and crew monitoring console refactor. 2018-02-15 14:31:27 -06:00
Jordan Brown
1b8a0232c0 Merge pull request #35655 from ShizCalev/DOOR-LAYERING-FIX-FINALE 
fixes firedoor layer for the last god damn time
 2018-02-15 10:40:13 -06:00
AnturK
10a40524ab Cleans up remnant traitor cyborg code and AI hacking. 2018-02-15 10:40:04 -06:00
Poojawa
01bc7310b6 Cryopods from Oracle Station 
It's really nice to have a tg based station that's porting good shit.
 2018-02-14 14:06:33 -06:00
CitadelStationBot
44d2759921 [MIRROR] Fixes near_camera runtime (#5482) 
* Merge pull request #35624 from ShizCalev/near_camera-runtime-fix

Fixes near_camera runtime

* Fixes near_camera runtime
 2018-02-14 10:56:19 -06:00
deathride58
4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045 
TG Sync #4985279348672983476
 2018-02-14 04:11:44 +00:00
ExcessiveUseOfCobblestone
745ca227c3 Fixes Battlecruiser Turrets and Improves Turret's Faction Capabilities (#35427) 
* Update portable_turret.dm

* Update portable_turret.dm

* Update portable_turret.dm

* f
 2018-02-13 20:47:14 -06:00
vuonojenmustaturska
d44ccdb009 Merge pull request #35575 from ShizCalev/communications-console-runtime 
Fixes communications console runtime
 2018-02-13 10:29:47 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
oranges
aa4b92faad Merge pull request #35598 from ShizCalev/announcement-exploit-fix 
[s] fixes announcement system exploit
 2018-02-12 19:33:28 -06:00
deathride58
06b7f239c4 Merge pull request #5447 from Citadel-Station-13/upstream-merge-35433 
[MIRROR] Cult Update? Cult Update!
 2018-02-12 23:29:06 +00:00
Robustin
1825c944b6 Cult Update? Cult Update! (#35433) 
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
 2018-02-12 15:18:21 -06:00
deathride58
f5eb7f7101 Update cell_charger.dm 2018-02-12 13:42:51 -05:00
Dax Dupont
a0feb17597 Cell chargers are now buildable and (upgradable!) machines. 2018-02-12 11:15:52 -06:00
BordListian
87a1e69238 - You don't get to bring friends (#35510) 2018-02-11 12:41:52 -06:00
CitadelStationBot
51d15518ae Merge pull request #5409 from Citadel-Station-13/upstream-merge-35456 
[MIRROR] [s] Fixes altclick exploits
 2018-02-11 09:43:09 -06:00
MoreRobustThanYou
73c1088d5a Adds a SCP-294 ruin 2018-02-11 05:13:56 -06:00
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
deathride58
21be004afa Merge pull request #5406 from Citadel-Station-13/upstream-merge-35424 
[MIRROR] Replaces some var values with defines
 2018-02-11 02:24:48 +00:00
Jordan Brown
fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
Jordan Brown
3674d38a99 Merge pull request #35493 from DaxDupont/cloner 
Fixed cloning pod status not updating when autocloning.
 2018-02-10 11:09:52 -06:00
Robustin
25323a9b12 Fixes limbgrower having max volume of 0 (#35491) 
* Fixed limbgrower having maxvolume of 0

* Update limbgrower.dm
 2018-02-10 09:56:56 -06:00
oranges
39b6d1fb49 Merge pull request #35398 from ACCount12/pr_atomization 
Removes an unnecessary type check from autolathe attackby
 2018-02-08 03:19:50 -06:00
CitadelStationBot
717da969a6 [MIRROR] Var cleanup and map fixes (#5359) 
* Merge pull request #35429 from ShizCalev/snowdin-cleanup

Var cleanup and map fixes

* Var cleanup and map fixes
 2018-02-07 20:04:04 -06:00
deathride58
b1ea2773fd Merge pull request #5357 from Citadel-Station-13/upstream-merge-35383 
[MIRROR] Changes doppler array point formula
 2018-02-07 20:52:09 +00:00
deathride58
bfce0e4885 Merge pull request #5339 from Citadel-Station-13/upstream-merge-35352 
[MIRROR] Toy Daggers!
 2018-02-07 20:51:39 +00:00
deathride58
7295e9ba82 Update doppler_array.dm 2018-02-07 14:14:53 -05:00