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

3059 Commits

Author SHA1 Message Date
kevinz000 c21bd60929 fix 2020-03-03 03:04:23 -07:00
kevinz000 56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
kevinz000 045d5b2dbf fixes 2020-02-27 20:06:52 -07:00
kevinz000 626cf886d6 Update twohanded.dm 2020-02-26 05:31:47 -07:00
Ghom 5bd62d129f Merge pull request #10877 from kevinz000/staves 
Riot Electrostaves
 2020-02-25 20:32:36 +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
kevinz000 bfb8139225 DefaultCombatknockdown 2020-02-25 03:18:37 -07:00
kevinz000 00c70acee9 Target wew 2020-02-24 13:20:12 -07:00
kevinz000 26b908f53d thonk 2020-02-24 13:19:38 -07:00
kevinz000 90d7fd81b1 k 2020-02-24 13:17:08 -07:00
kevinz000 fa9e275237 k 2020-02-24 13:16:12 -07:00
kevinz000 59e95555bb Merge remote-tracking branch 'citadel/master' into staves 2020-02-24 13:09:45 -07: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
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
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 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 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 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
kevinz000 f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07: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
kevinz000 a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07: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
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 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
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 c7273c03be Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-19 19:12:27 -07:00
kevinz000 8610c7f664 better inhands 2020-02-19 19:10:19 -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 b983aa75ea Merge pull request #11145 from Ghommie/Ghommie-cit586 
Something about pAIs and silicon access priviledges.
 2020-02-19 18:59:10 -07:00
Arturlang 796f51b557 Merge branch 'master' into TGUI_Next_Nanites 2020-02-20 00:52:55 +02:00
kevinz000 b66b8ac2a0 Merge remote-tracking branch 'citadel/master' into staves 2020-02-19 14:32:28 -07:00
necromanceranne af6df2784c holy shit this was still in the fucking game 2020-02-20 04:46:30 +11:00
kevinz000 0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Ghom 0619521418 Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4 
Corrects a few cargo crates/exports (and nerfs some)
 2020-02-19 02:10:25 +01:00
Ghom 2b7f27270f Merge pull request #11083 from Hatterhat/sword-cleaning 
purifying longswords - alt title "there's no way this should have worked"
 2020-02-18 19:02:34 +01:00
Ghommie 698f0b8177 Something about pAIs and silicon access priviledges. 2020-02-18 16:20:44 +01:00