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

13645 Commits

Author SHA1 Message Date
deathride58 82d527b760 Merge pull request #8765 from Ghommie/Ghommie-cit91 
Merging the end-of-shift and its shuttle autocall announcements into one.
 2019-07-08 18:04:27 -04:00
deathride58 e19c622b08 Merge pull request #8837 from Citadel-Station-13/revert-8244-iv-dripper-punctures 
Revert "Adds a can_inject check to IV Drips"
 2019-07-08 17:57:30 -04:00
deathride58 e391995b8e Merge pull request #8792 from Citadel-Station-13/kevinz000-patch-51 
Buffs integrated circuitry advanced lights
 2019-07-08 17:56:12 -04:00
deathride58 840cfb8ac0 Merge pull request #8818 from Citadel-Station-13/kevinz000-patch-53 
fixes stimulum by changing one number
 2019-07-08 17:54:56 -04:00
deathride58 58189d1528 Merge pull request #8820 from Ghommie/Ghommie-cit104 
Ports "Add cancel button to assault pod destination selector"
 2019-07-08 17:54:08 -04:00
deathride58 fca529cb07 Merge pull request #8823 from Ghommie/Ghommie-cit108 
Ports "fixes spontaneous appendicitis picking incompatible biotypes"
 2019-07-08 17:52:49 -04:00
deathride58 81bbab809e Merge pull request #8821 from Ghommie/Ghommie-cit105 
Ports "Updates corgi & parrot inventory panels to the same formatting as other mobs"
 2019-07-08 17:51:32 -04:00
deathride58 3be59ba804 Merge pull request #8828 from Ghommie/Ghommie-cit113 
Ports "Makes ventcrawl much easier on the client"
 2019-07-08 17:49:01 -04:00
deathride58 33ed7cf72c Merge pull request #8822 from Ghommie/Ghommie-cit107 
[s] ports "Fixes infinite brass generation exploit"
 2019-07-08 17:43:59 -04:00
deathride58 ee6004e781 Merge pull request #8835 from Linzolle/berethair 
normalises hop and cap's berets to not hide hair
 2019-07-08 17:43:34 -04:00
deathride58 8f77e9cbe5 Merge pull request #8839 from Ghommie/Ghommie-cit118 
Fixes lobby ghost roles, for real.
 2019-07-08 17:32:53 -04:00
deathride58 11a48880e1 Merge pull request #8834 from Ghommie/Ghommie-cit117 
Fixes up space ninja's energy net.
 2019-07-08 17:31:04 -04:00
Ghommie 49c8a08c15 Removes the ? that suppressed runtimes. 2019-07-07 20:39:40 +02:00
Ghommie ef745a850d Fixing lobby ghost roles for real. 2019-07-07 20:38:08 +02:00
kevinz000 d61732472c Merge pull request #8831 from Ghommie/Ghommie-cit115 
Holographic PDA Quickfix!
 2019-07-07 11:08:15 -07:00
kevinz000 1b4df74efb Merge pull request #8802 from Ghommie/Ghommie-cit101 
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
 2019-07-07 02:39:07 -07:00
kevinz000 6e5ec4594c Merge pull request #8800 from Sishen1542/freeza 
Adds click interactions  to atmos heater/freezer
 2019-07-07 02:35:12 -07:00
kevinz000 e227d5575c Merge pull request #8825 from Ghommie/Ghommie-cit110 
Ports "Fixes default supplypods exploding their contents" & co.
 2019-07-07 02:34:47 -07:00
kevinz000 91f114f717 Merge pull request #8832 from Ghommie/Ghommie-cit116 
Fixes new player runtime that makes people unable to join rounds.
 2019-07-07 02:33:32 -07:00
kevinz000 9d13576cc9 Merge pull request #8826 from Ghommie/Ghommie-cit111 
Ports "Adds safer helper for alt-click turf listing"
 2019-07-07 02:32:56 -07:00
kevinz000 6944725cfb Merge pull request #8824 from Ghommie/Ghommie-cit109 
Ports "Fixes damp rag not smothering people"
 2019-07-07 02:31:26 -07:00
kevinz000 fd592e5815 Merge pull request #8827 from Ghommie/Ghommie-cit112 
Ports "Makes looping sounds use client time"
 2019-07-07 02:31:10 -07:00
kevinz000 d0a74ef331 Revert "Adds a can_inject check to IV Drips" 2019-07-07 02:29:49 -07:00
Linzolle 1731d4a266 normalises hop and cap's berets to not hide hair 2019-07-07 01:44:58 -05:00
Ghommie 3404131f3a don't init yet. 2019-07-07 05:19:13 +02:00
Ghommie 696dd2839b clunky. 2019-07-07 05:13:14 +02:00
Ghommie b2192f0530 Fixes up space ninja's energy net. 2019-07-07 05:06:03 +02:00
Ghommie fe2abc990b Fixes new player runtime that makes people unable to join rounds. 2019-07-06 04:51:56 +02:00
Ghommie 00879a6e28 Holographic PDA Quickfix! 2019-07-06 03:46:01 +02:00
kevinz000 748550895d Merge pull request #8632 from Arturlang/Traitor_Codeword_Highlight 
Ports traitor codeword highlighting
 2019-07-05 06:57:49 -07:00
kevinz000 77743c9a0f Merge pull request #8794 from Ghommie/Ghommie-cit100 
Fixes the uplink category indexing.
 2019-07-05 06:56:22 -07:00
kevinz000 231e0170a9 Merge pull request #8663 from Ghommie/Ghommie-cit58 
Peanuts, peanut butter, and PB&J sandwiches.
 2019-07-05 06:55:49 -07:00
kevinz000 7544748570 Merge pull request #8790 from deathride58/pryablesleepers 
Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers via crowbar
 2019-07-05 06:55:18 -07:00
Ghommie 3c2e03c247 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58 2019-07-04 23:46:04 +02:00
Ghommie eed30d73a9 Ports "Makes ventcrawl much easier on the client" 2019-07-04 23:28:14 +02:00
Ghommie 7be9305b03 Ports "Makes looping sounds use client time" 2019-07-04 22:50:11 +02:00
Ghommie 5ff8be0faa Ports "Adds safer helper for alt-click turf listing" 2019-07-04 22:42:51 +02:00
Ghommie b41e289db3 Ports "Fixes default supplypods exploding their contents" & co. 2019-07-04 22:35:13 +02:00
Ghommie 37cf41a3bb Ports "Fixes damp rag not smothering people" 2019-07-04 22:06:16 +02:00
Ghommie b501edf9cf Ports "fixes spontaneous appendicitis picking incompatible biotypes" 2019-07-04 22:02:20 +02:00
Ghommie 98418c7f87 [s] ports "Fixes infinite brass generation exploit" 2019-07-04 21:54:20 +02:00
Ghommie f134d58464 Flak. 2019-07-04 21:37:06 +02:00
Ghommie 0361a0a863 Ports "Updates corgi & parrot inventory panels to the same formatting as other mobs" 
also "Makes Corgi collars removable"
 2019-07-04 21:33:56 +02:00
Ghommie a2691e8f13 Ports "Add cancel button to assault pod destination selector" 2019-07-04 21:13:03 +02:00
Sishen e5cd1bd7c2 Update thermomachine.dm 2019-07-03 17:46:05 -04:00
Sishen 4fa244e8e4 Update thermomachine.dm 2019-07-03 17:41:27 -04:00
Sishen 9e514bfab5 Update thermomachine.dm 2019-07-03 17:39:41 -04:00
Sishen df75f9f289 Update thermomachine.dm 2019-07-03 17:38:19 -04:00
Sishen a9f5b99510 Update thermomachine.dm 2019-07-03 16:55:14 -04:00
kevinz000 ba74189192 Merge pull request #8768 from Ghommie/Ghommie-cit94 
New sprites for the some pda cartridges.
 2019-07-03 13:47:53 -07:00