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

31195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MrJWhit 0e330c2aba Merge branch 'master' of https://github.com/MrJWhit/Citadel-Station-13 2020-03-05 21:25:15 -05:00
MrJWhit 5470e33a30 Merge pull request #1 from MrJWhit/kitchen-adjustments 
Kitchen adjustments
 2020-03-04 20:14:25 -05:00
MrJWhit fcfff59ea6 Update KiloStation.dmm 2020-03-04 20:11:28 -05:00
MrJWhit f5f54196d7 Update KiloStation.dmm 2020-03-04 20:04:02 -05:00
CitadelStationBot dbfd2eb183 Automatic changelog generation for PR #11218 [ci skip] 2020-03-04 17:26:15 -06:00
Ghom 68273d0211 Merge pull request #11218 from Seris02/nomoreailipreading 
no more ai illegal upgrades, version 2 because I forgot I made it in web browser last time
 2020-03-05 00:26:12 +01:00
CitadelStationBot 08b26b0e59 Automatic changelog generation for PR #11181 [ci skip] 2020-03-04 16:50:01 -06:00
Ghom 5e4f8dc6a0 Merge pull request #11181 from Detective-Google/big-chode-energy 
changes sausage girth from circumference -> diameter
 2020-03-04 23:49:58 +01:00
Ghom d78cdb9b37 Merge pull request #11130 from BlackMajor/SpaceRuins 
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
 2020-03-04 23:46:10 +01:00
CitadelStationBot 3a5661ad8a Automatic changelog generation for PR #11318 [ci skip] 2020-03-04 16:40:57 -06:00
Ghom c373323690 Merge pull request #11318 from Citadel-Station-13/Linzolle-patch-1 
fix nose booping
 2020-03-04 23:40:54 +01:00
CitadelStationBot c0303c2a46 Automatic changelog generation for PR #11327 [ci skip] 2020-03-04 16:17:03 -06:00
Ghom ec5449b349 Merge pull request #11327 from Arturlang/dropper_fix 
Fixes reagent containers transfer cycling
 2020-03-04 23:17:00 +01:00
Artur f879316b4e All it lacked is a return. 2020-03-04 23:29:08 +02:00
MrJWhit be6bebbed4 Minor elements to kilostation 
asdf
 2020-03-04 15:46:12 -05:00
CitadelStationBot c1dadec519 Automatic changelog generation for PR #11310 [ci skip] 2020-03-04 13:29:16 -06:00
Lin 1a1e362e80 Merge pull request #11310 from Citadel-Station-13/Ghommie-patch-2 
Fixing mob holders inventory slot flags (ergo they are not glasses)
 2020-03-04 13:29:13 -06:00
CitadelStationBot 733cdd1c40 Automatic changelog generation for PR #11277 [ci skip] 2020-03-04 10:11:42 -06:00
Ghom 7a2e0892d3 Merge pull request #11277 from kevinz000/sword_point 
En garde! (nah just sword pointing)
 2020-03-04 17:11:39 +01:00
CitadelStationBot 0b777c5efc Automatic changelog generation for PR #11303 [ci skip] 2020-03-04 10:11:15 -06:00
Ghom 6dd27506e1 Merge pull request #11303 from Citadel-Station-13/kevinz000-patch-22 
what the fuck you mean music line too long??
 2020-03-04 17:11:12 +01:00
Ghom a2fe9f0d23 Update toys.dm 2020-03-04 17:03:26 +01:00
Ghom 0b74bc9da3 Update twohanded.dm 2020-03-04 16:43:57 +01:00
Ghom 7c8b490cb3 Update energy.dm 2020-03-04 16:40:28 +01:00
CitadelStationBot f40af6014c Automatic changelog generation for PR #11314 [ci skip] 2020-03-04 08:40:05 -06:00
Ghom 976080d7b2 Merge pull request #11314 from KathrinBailey/Kat-Furniture 
Kat Furniture! New sofas, chess pieces, nine new posters and shower curtain functionality!
 2020-03-04 15:40:01 +01:00
Ghom 8c6b5b49c5 Update contraband.dm 2020-03-04 15:39:23 +01:00
KathrinBailey 11750b4fa9 removed redundant icon line 2020-03-04 14:16:27 +00:00
CitadelStationBot dfababf692 Automatic changelog generation for PR #11321 [ci skip] 2020-03-04 07:31:12 -06:00
Ghom df5b4ab56d Merge pull request #11321 from kevinz000/storage_components_are_bad 
fixes storage closing while dragging, aka "this one line fix that i procrastinated giving a fuck about for about 9 months now"
 2020-03-04 14:31:09 +01:00
kevinz000 f67fa08f0f Merge pull request #11274 from Citadel-Station-13/Ghommie-patch-5 
Fixing a whoopsie with airlocks.
 2020-03-04 05:58:44 -07:00
BlackMajor 43e77f7d3a Last few fixes. Adds arcane wand to dead wizard roid. 2020-03-04 19:12:56 +13:00
kevinz000 5e2414bd90 fix 2020-03-03 22:25:35 -07:00
kevinz000 18bdb753d3 bet 2020-03-03 21:13:59 -07:00
kevinz000 0cf7f2e882 Update energy.dm 2020-03-03 21:07:24 -07:00
kevinz000 cbf2355f19 Update code/datums/elements/sword_point.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-03 21:06:05 -07:00
CitadelStationBot a883a1a7bf Automatic changelog generation for PR #11308 [ci skip] 2020-03-03 21:28:50 -06:00
kevinz000 90188c51bf Merge pull request #11308 from Putnam3145/stop-lag 
Removes lag
 2020-03-03 20:28:47 -07:00
CitadelStationBot 4c68baece9 Automatic changelog generation for PR #11320 [ci skip] 2020-03-03 21:18:06 -06:00
Putnam3145 c97fd1e41e Merge pull request #11320 from Citadel-Station-13/Ghommie-patch-4 
Stops ninjas employed by syndies from receiving friendly flavor objectives.
 2020-03-03 19:18:03 -08:00
KathrinBailey 97733e464d ghommie change and armrest bug fix 2020-03-04 01:35:00 +00:00
Ghom 284ef326c7 Stops ninjas employed by syndies from receiving friendly flavor objectives. 2020-03-04 00:36:18 +01:00
CitadelStationBot 7a539d0a78 Automatic changelog generation for PR #11289 [ci skip] 2020-03-03 14:30:17 -06:00
Ghom 62eef87835 Merge pull request #11289 from Trilbyspaceclone/patch-301 
Cotton/Durathreads now stack to 80
 2020-03-03 21:30:14 +01:00
Ghom 0b5481f9b9 Merge pull request #11237 from kevinz000/reagent_logging_3 
reagent logging pr attempt 3 but it works
 2020-03-03 21:27:17 +01:00
Lin 622a060857 use defines 2020-03-03 20:22:57 +00:00
Lin 6e4a22f4fe fix boop 2020-03-03 20:18:08 +00:00
KathrinBailey 86790c69a5 credits accidently left out previously 
re-adds nod to CEV Eris for their original sprites.
 2020-03-03 14:38:16 +00:00
KathrinBailey 7e0abda3c1 fixing merge conflicts 
includes trillby's new posters.
 2020-03-03 13:56:01 +00:00
KathrinBailey 83ec1e428c Merge remote-tracking branch 'upstream/master' into Kat-Furniture 2020-03-03 13:48:18 +00:00