shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,801 Commits 5 Branches 0 Tags
70252d291464443d001981b94ea3093d2d44b85e
Commit Graph
17043 Commits
Author SHA1 Message Date
Ghommie 95cc84e69e Fixes a few holo barriers' transparency. 2019-12-07 12:13:33 +01:00
Ghommie d38475f06d i'm tired of this 2019-12-07 12:05:12 +01:00
TrilbyspacecloneandGitHub 156b7cabb1 Update recipes_misc.dm 2019-12-07 04:41:28 -05:00
kevinz000andGitHub c706720dd1 Merge pull request #9912 from Owai-Seek/cargocleanupv2boogaloo 
Added 15+ new crates, fixed issues raised in #9901
 2019-12-07 01:52:35 -07:00
TrilbyspacecloneandGitHub 7ab66fd2e2 no wounder why I didnt push it, it never complied 2019-12-07 03:50:20 -05:00
TrilbyspacecloneandGitHub 6faad2e30b Update recipes_misc.dm 2019-12-07 03:46:25 -05:00
Ghommie 7cc332960b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-12-07 05:30:07 +01:00
Ghommie 0a0094e80c Fixes stuff I broke with my coding extravaganza. 2019-12-07 05:11:29 +01:00
Ghommie 9152fe49e6 Typo. 2019-12-07 04:49:18 +01:00
Ghommie b9751006bb Fixes reviver implant having been a crapshot ever since soft-crit was introduced years ago. 2019-12-07 04:46:54 +01:00
Ghommie e0caf6007b Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter... 2019-12-07 04:02:33 +01:00
kevinz000andGitHub 2d9c6e64c5 Update launchpad_control.dm 2019-12-06 19:55:54 -07:00
nik707andGitHub e4a41c6169 Merge pull request #9932 from Putnam3145/fix-genital-contam 
Make organs no longer radiaoctively contaminable.
 2019-12-06 20:37:53 -06:00
Ghommie 723690bab0 Demodularize defib disks and projectiles icons. 2019-12-06 23:07:50 +01:00
Ghommie 2addcb4142 Fixes bubblegum's death not granting the arena shuttle because the medals subsystem is not hub enabled 2019-12-06 16:37:46 +01:00
Ghommie 99f694c94a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit433 2019-12-06 15:31:40 +01:00
Ghommie 622b3e5608 ddddddd 2019-12-06 15:31:05 +01:00
Winter Flare 6377f1b3a9 Organisation 2019-12-06 03:42:57 -05:00
kevinz000andGitHub 968e9c099d Update silicon.dm 2019-12-06 01:12:44 -07:00
Winter Flare 8bd6c58bcd Merge branch 'master' into cargocleanupv2boogaloo 2019-12-06 01:27:44 -05:00
Winter Flare b860c6e0bb Merge branch 'master' into cargocleanupv2boogaloo 2019-12-06 01:14:44 -05:00
Winter Flare 83b77650a8 Additional Cleanup 
Reorganised Materials, added Bulk Cotton Crate
Removed Wooden Barrel / Toner Crates
Modified Fruit Delux Crate
Modified Cargo Supplies Crate
Moved several crates to their proper areas.
 2019-12-06 01:13:54 -05:00
Putnam3145andGitHub 4e022af46f Merge pull request #10056 from Ghommie/Ghommie-cit430 
Ports "Slightly improves visible and audible messages."
 2019-12-05 21:16:47 -08:00
kevinz000andGitHub 8cb6ff10b8 Merge pull request #10034 from Ghommie/Ghommie-cit420 
Fixes the incongruent bone satchel description.
 2019-12-05 22:00:38 -07:00
kevinz000andGitHub e16b61b865 Merge pull request #10043 from Arturlang/patch-1 
PDA cartridges and their contents can no longer be contaminated
 2019-12-05 21:58:33 -07:00
kevinz000andGitHub b8bb0f2924 Merge pull request #10048 from Ghommie/Ghommie-cit426 
Demodularize moodlets.
 2019-12-05 21:56:29 -07:00
kevinz000andGitHub 6a305dfe4f Merge pull request #9955 from Ghommie/Ghommie-cit394 
Updating supply pods code.
 2019-12-05 21:54:42 -07:00
Putnam3145andGitHub 6b2d3b116d Merge branch 'master' into Ghommie-cit430 2019-12-05 20:53:14 -08:00
kevinz000andGitHub 90f31f5b2b Merge pull request #10023 from Sishen1542/i 
meteors now only give 60-90 seconds warning
 2019-12-05 21:52:32 -07:00
kevinz000andGitHub a65588009c Merge pull request #10038 from Trilbyspaceclone/patch-240 
Makes trash carts craftable with plastic
 2019-12-05 21:51:30 -07:00
kevinz000andGitHub f937c4d877 Merge pull request #10046 from Ghommie/Ghommie-cit424 
Ports flag for bespoke elements.
 2019-12-05 21:50:19 -07:00
kevinz000andGitHub 13f43eb783 Merge pull request #10045 from Trilbyspaceclone/patch-241 
Makes wallets hold more stuff
 2019-12-05 21:49:50 -07:00
kevinz000andGitHub 54be35a243 Merge pull request #9997 from Sishen1542/nuked 
removes superspeed from nuka cola
 2019-12-05 21:48:34 -07:00
Putnam3145andGitHub 3633c6936d Merge pull request #10052 from Ghommie/Ghommie-cit428 
Banishes some "me" emote magic numbers from this realm.
 2019-12-05 20:47:39 -08:00
kevinz000andGitHub b932841adf Merge pull request #9975 from Ghommie/Ghommie-cit404 
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
 2019-12-05 21:47:29 -07:00
Putnam3145andGitHub 62c0d59102 Merge pull request #10008 from Seris02/sleepingcarphallucination 
adds sleeping carp wrist wrench/violent grab hallucination
 2019-12-05 20:46:26 -08:00
kevinz000andGitHub 176bde7829 Merge pull request #9990 from Linzolle/strange-reagent 
Fixes to strange reagent and very slight nerf I guess.
 2019-12-05 21:45:09 -07:00
kevinz000andGitHub 5048995a58 Merge pull request #9993 from Ghommie/Ghommie-cit412 
Ports tgstation loom changes, and durathred golems.
 2019-12-05 21:44:25 -07:00
kevinz000andGitHub e2f9a68c2c Merge pull request #10049 from Useroth/new-tg-plants 
Colored fairy grass, because fuck your eyes.
 2019-12-05 21:43:24 -07:00
kevinz000andGitHub b5595114c1 Merge pull request #9805 from Ghommie/Ghommie-cit352 
Uplink items are now automatically sorted alphabetically.
 2019-12-05 21:40:09 -07:00
Ghommie 4ceb0a25d0 undefined var. 2019-12-06 05:38:03 +01:00
kevinz000andGitHub d217a9f445 Merge pull request #10032 from Ghommie/Ghommie-cit418 
Porting some return type annotations and bad keyword fixes.
 2019-12-05 21:33:12 -07:00
kevinz000andGitHub bd1b79b182 Merge pull request #10041 from kappa-sama/patch-8 
[SALT] chargers and chaos stands are now reasonable to fight
 2019-12-05 21:29:39 -07:00
kevinz000andGitHub 2fcdb24fe3 Merge pull request #10019 from Seris02/wintercoattide 
Adds CentCom, Assistant's formal, ratvarian and narsian winter coats + loadout for formal
 2019-12-05 21:29:08 -07:00
kevinz000andGitHub 70d305611c Merge pull request #10042 from Ghommie/Ghommie-cit422 
fixes sofa overlays doing nothing, because their layer wasn't properly set.
 2019-12-05 21:28:24 -07:00
kevinz000andGitHub bbd482015c Merge pull request #10033 from Ghommie/Ghommie-cit419 
Fixes traitor codewords highlight and some other hear signal hooks.
 2019-12-05 21:28:03 -07:00
kevinz000andGitHub 29497320c1 Merge pull request #10025 from Linzolle/butchering 
refactor butchering component
 2019-12-05 21:19:57 -07:00
Ghommie d3d1116094 null = n_color, no. 2019-12-06 03:59:51 +01:00
Ghommie 2528714035 I have no liability about glowing robotic eyes not automatically updating right here. 2019-12-06 03:56:48 +01:00
Ghommie d6fe78f4a7 fixes on_mob eyes overlays not updating properly sometimes. 2019-12-06 03:38:39 +01:00