cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,315 Commits 55 Branches 0 Tags
eff86a449f3fa83c28fa80fcaa41d2f28ad42f98
Commit Graph

11709 Commits

Author SHA1 Message Date
Seris02
f663c4db96 tiny fixes 2019-12-30 11:24:12 +08:00
Ghommie
87cca7a649 ...which var are you? 2019-12-30 01:05:54 +01:00
Ghommie
8a32b89f17 Wait a minute... 2019-12-30 01:05:21 +01:00
Ghommie
55cb844bc2 chestbursters deleting brains fix. 2019-12-30 01:00:36 +01:00
Ghommie
edd05cebea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-30 00:28:36 +01:00
BlackMajor
c14a639f6e crusher wasn't dealing damage whoops 2019-12-30 12:25:12 +13:00
Ghommie
0ab817c208 [s] Fixes ghost anti-ghostrole timers a little. 2019-12-29 22:22:20 +01:00
keronshb
baf8b28f3a Fixes Reduced Diagnostics and adds disks 
Fixes reduced diagnostics not working properly and adds program disks for each of the new nanites.
 2019-12-29 16:03:38 -05:00
Trilbyspaceclone
1cc4464726 Update engine_goggles.dm 2019-12-29 15:01:02 -05:00
Trilbyspaceclone
ee7346f280 got it 2019-12-29 15:00:33 -05:00
Trilbyspaceclone
a2b79e043f Update code/modules/hydroponics/grown/grass_carpet.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-29 14:57:22 -05:00
Ghom
d1a4bf6895 Merge pull request #10323 from Seris02/pandorafix 
probably fixes pandoras attacking their owners
 2019-12-29 17:30:59 +01:00
Ghom
b549670e39 Merge pull request #10324 from Trilbyspaceclone/patch-253 
Honey no longer murders slimes
 2019-12-29 17:24:19 +01:00
Seris02
b96bcf6eec tiny fix 2019-12-29 23:47:30 +08:00
Seris02
9b3654e4ff telescopic IVs 2019-12-29 23:26:53 +08:00
Seris02
a39c0249c4 marshmallow 2019-12-29 21:55:25 +08:00
BlackMajor
8948e0491e add mining card 2019-12-30 02:07:49 +13:00
BlackMajor
b811d3e57e More work on it 2019-12-30 01:23:41 +13:00
Seris02
f6caff8227 hnnnnnng code improvements 2019-12-29 20:10:15 +08:00
Seris02
3d3407363c auto ooc 2019-12-29 18:48:00 +08:00
ItzGabby
9b5204bd46 Fixes UI for poly collars 
AltClick for collars was seemingly forgotten so I've added it back
 2019-12-29 05:15:25 -05:00
BlackMajor
375e59a77d Merge branch 'master' into Yeehaw 2019-12-29 22:12:40 +13:00
BlackMajor
2e03a529bf checking off the list 2019-12-29 22:11:10 +13:00
BlackMajor
206a5e168a More mining changes 2019-12-29 20:15:49 +13:00
keronshb
ab8a9227b4 Ports reflector blobs 
Ports reflectors from /TG/
 2019-12-28 23:02:05 -05:00
Trilbyspaceclone
94f305656d Update grass_carpet.dm 2019-12-28 22:57:38 -05:00
Trilbyspaceclone
75a24449c8 Update borghydro.dm 2019-12-28 21:36:21 -05:00
kevinz000
96d9fed565 Merge pull request #10091 from Ghommie/Ghommie-cit442 
Reduces the blue, amber and red alert sounds volume.
 2019-12-28 18:08:33 -08:00
kevinz000
429aaaa342 Merge pull request #10318 from Trilbyspaceclone/patch-252 
Allows AI/Sillicons to speak slime
 2019-12-28 18:07:55 -08:00
Putnam
ed0c91b556 Makes ass slap attempts fail more loudly on opted-out mobs 2019-12-28 16:23:02 -08:00
Arturlang
10538e6da9 Aarggghh small fucking differences 2019-12-29 02:12:22 +02:00
Arturlang
c01852ff5d Whoops 2019-12-29 02:04:00 +02:00
Arturlang
207a72b84c Physiology so species changes dont fuck it up 2019-12-29 01:58:00 +02:00
Ghom
f68d7fa1a3 Merge pull request #10328 from Putnam3145/dynamic-ghost-tweaks 
Makes ghost cafe mobs actually a ghost role
 2019-12-29 00:08:38 +01:00
Ghommie
f93077e730 F to pay respect. 2019-12-29 00:08:34 +01:00
Ghommie
7837688426 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-28 23:41:10 +01:00
Ghommie
37441437d1 a 2019-12-28 23:02:28 +01:00
keronshb
390cfd8b64 Nanite ports from /tg/ 
Ports a couple of the newer nanite features from /tg/
 2019-12-28 16:56:17 -05:00
Putnam
7947f06557 Made sure ghost cafe visitors don't get midround antags 2019-12-28 13:56:03 -08:00
Ghom
4fb549631f Don't use named arguments on new, please. 2019-12-28 19:12:10 +01:00
Seris02
897766e781 maybe fixes? 2019-12-29 00:55:13 +08:00
Seris02
70744ef171 ah 2019-12-29 00:19:19 +08:00
Seris02
46f3a70c4b even more weh. 2019-12-29 00:09:30 +08:00
Seris02
c0e8e55d70 more weh. 2019-12-29 00:07:11 +08:00
Ghom
d2c1eb3e47 Merge pull request #10299 from kappa-sama/patch-13 
sunflowers are no longer explosive
 2019-12-28 17:02:50 +01:00
Ghom
fe78c98f71 Merge pull request #10297 from Hatterhat/tg-45547-luxbar 
the one with the luxury bar capsule
 2019-12-28 17:00:19 +01:00
Arturlang
c4975d88e4 Wait no its actually the other way around. 2019-12-28 15:26:44 +02:00
Arturlang
d2709e86ec What about this? 2019-12-28 15:20:16 +02:00
Seris02
2c26c3bdec does the fix? 2019-12-28 21:11:17 +08:00
Ghom
a7ccd85bdb Merge pull request #10291 from Citadel-Station-13/kevinz000-patch-1 
fixes pai holochassis spam
 2019-12-28 13:15:42 +01:00