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

7050 Commits

Author SHA1 Message Date
Ghom
5ee2f0dcd8 Merge pull request #11169 from PersianXerxes/ohHeyKilo 
Ports Kilo Station from Skyrat
 2020-02-25 14:48:37 +01:00
Ghom
ea5774e713 Merge pull request #11225 from r4d6/Random-Mining 
Make the mining base's placement random
 2020-02-25 14:41:40 +01:00
Ghom
b8fa0c0977 Merge pull request #11217 from Citadel-Station-13/kevinz000-patch-12 
plushies now use SAFEPICK
 2020-02-25 14:31:07 +01:00
Ghom
f86e17d945 Merge pull request #11129 from Owai-Seek/movefood-2-16-20 
Reorganize Food Recipes, "Balance" Tweaks
 2020-02-24 20:53:36 +01:00
r4d6
f76a1c15f3 Port random mining base 2020-02-24 13:27:54 -05:00
Ghom
213a406568 Merge pull request #11167 from Citadel-Station-13/kevinz000-patch-11 
hand teles uses a (slightly) less atrocious sprite for the beam
 2020-02-24 16:40:17 +01:00
Ghom
9355e9319b Merge pull request #11110 from Hatterhat/hyper-96-aus-unk 
you kids like extend votes?
 2020-02-24 16:39:16 +01:00
kevinz000
8cf41997f5 Merge pull request #11201 from Hatterhat/bows 
really just a lot of shit about bows
 2020-02-24 02:33:54 -07:00
kevinz000
0cfa6699b1 yeah ok fine 2020-02-24 02:31:14 -07:00
kevinz000
43c17b4ab3 Merge pull request #11180 from Detective-Google/psych+paramedic 
Adds epic and also cool paramedics [lazy tg port]
 2020-02-24 02:30:36 -07:00
kevinz000
ae6c388510 Merge pull request #11214 from Citadel-Station-13/Ghommie-patch-3 
Fixing pAI radios inability to be toggled on/off
 2020-02-24 02:23:30 -07:00
kevinz000
73c03adbbb Merge pull request #11199 from Detective-Google/pai.pai.pai.png 
Lets pAIs hold encryption keys and play music.
 2020-02-24 02:23:17 -07:00
kevinz000
e76eff6966 Update plushes.dm 2020-02-24 02:21:51 -07:00
kevinz000
27b7cd560c Update plushes.dm 2020-02-24 01:32:04 -07:00
Ghom
f5dbb0b20d Merge pull request #11187 from Trilbyspaceclone/sweet 
New bar sign, The Hive
 2020-02-23 22:47:37 +01:00
Ghom
3e232f93d9 Update barsigns.dm 2020-02-23 22:47:21 +01:00
Ghom
825beb41c1 Update paicard.dm 2020-02-23 22:44:38 +01:00
Ghom
b3149d930f Fixing pAI radios inability to be toggled on/off 2020-02-23 21:31:53 +01:00
Hatterhat
31a93d9f32 you'd think i'd have remembered to change paths 2020-02-23 14:27:40 -06:00
Ghommie
2b740f9bad [s] Fixing an issue with slot machines crashing the server. 2020-02-23 13:09:21 +01:00
Persi
4af2eee9dd Haha, okay... this will break Kilo 
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ohHeyKilo
 2020-02-23 02:28:18 -05:00
Hatterhat
b89a2314a2 mmm that's compiling i don't like that 2020-02-22 16:17:51 -06:00
Hatterhat
accc4ce776 grammar shit, silkstring buff, arrow costs, yikes 2020-02-22 15:33:07 -06:00
Hatterhat
75a5a6cd45 ellipses. dot dot dot. 2020-02-22 15:21:12 -06:00
Hatterhat
2d29b37ce9 slab spawns and grammar shidd 2020-02-22 15:14:09 -06:00
Detective Google
ca29246878 adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.) 2020-02-22 00:02:49 -06:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Winter Flare
79967b0ac5 Resolving some convos. 
Rename Pastries to Pastry & Sweets
Move all sweets to Pastry & Sweets
Revert Weight Class Changes
Add Whitelist to trays. Glasswear, Drinks, Foods, Kitchen Items, ect.
Move Brioche Cake item/recipe
Move Scotch Egg item/recipe
 2020-02-21 07:16:39 -05:00
TrilbySpaceClone
9ae903187f always abuzz 2020-02-21 04:18:24 -05:00
Detective Google
4c10c830bf Merge remote-tracking branch 'upstream/master' into psych+paramedic 2020-02-20 22:17:55 -06:00
Detective Google
a8f863f901 changes - sprites 2020-02-20 22:17:47 -06:00
Ghom
e92183e968 Merge pull request #10541 from Detective-Google/the-p-o-o-l 
adds the POOL to box station
 2020-02-21 02:43:04 +01:00
Lin
9999e15db9 Merge pull request #11155 from necromanceranne/cham_project_exploities 
Cham projector no longer lets you become literally unclickable
 2020-02-20 16:50:07 -06:00
Ghom
7763475b83 Merge pull request #10572 from Tupinambis/SiliconDefault 
Removes harm prevention clause indicators from relevant sources.
 2020-02-20 15:33:27 +01:00
Ghom
608bb0a04c Merge pull request #10649 from kevinz000/hijack 
Completely reworks the hijack objective, and shuttle hijacking in general
 2020-02-20 14:40:08 +01:00
Ghom
26bbc64f16 Merge pull request #11136 from Owai-Seek/broomport-2-17-19 
Ports Broom, Tweak Janitor Vendor
 2020-02-20 11:48:06 +01:00
Ghom
d680ab9fd5 Merge pull request #11025 from Arturlang/TGUI_Next_Nanites 
Ports TGUI Next and a lot of misc updates for nanites.
 2020-02-20 11:27:48 +01:00
Ghom
89f256866d Merge pull request #11033 from kevinz000/cmo_drapes 
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
 2020-02-20 11:24:50 +01:00
Ghom
f94f997cc2 Merge pull request #11080 from kevinz000/surubatons 
hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
 2020-02-20 11:09:46 +01:00
Persi
c4b4a90bd8 Oh hey it's KiloStation 
Trying to make Kilo open...

Finally, the work begins!

Kilo added!

Kilo Station!
 2020-02-20 00:58:54 -05:00
Putnam
71c71766e6 one of those runtimes that will never show up in play but boy howdy 2020-02-19 21:53:22 -08:00
kevinz000
2dd5a0cfb8 Merge branch 'master' into hijack 2020-02-19 22:25:31 -07:00
kevinz000
fd410963a9 Update teleportation.dm 2020-02-19 22:23:54 -07:00
kevinz000
4373f116e0 Update teleportation.dm 2020-02-19 22:07:03 -07:00
kevinz000
6f31e1270e Merge pull request #11098 from Trilbyspaceclone/bows! 
Silk into clothing, bows, arrows, quivers and more!
 2020-02-19 19:05:49 -07:00
kevinz000
9589c3116b Merge pull request #11115 from Ghommie/Ghommie-cit583 
Something more about runtime errors.
 2020-02-19 19:03:01 -07:00
kevinz000
8567346501 Merge pull request #10953 from Ghommie/Ghommie-cit564 
The awesome adventures of the missing spurdo line replacement file.
 2020-02-19 19:00:53 -07:00
kevinz000
3e073f160c Merge pull request #10910 from Citadel-Station-13/Ghommie-patch-6 
Fixing a little issue with sleeper UI and blood types.
 2020-02-19 19:00:32 -07:00
kevinz000
530416a5ac Merge pull request #11147 from Putnam3145/supermatter-objective-fix 
Supermatter sabotage no longer shows up with no supermatter
 2020-02-19 18:59:28 -07:00
kevinz000
b983aa75ea Merge pull request #11145 from Ghommie/Ghommie-cit586 
Something about pAIs and silicon access priviledges.
 2020-02-19 18:59:10 -07:00