shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,562 Commits 5 Branches 0 Tags
8a4e44758fa57d772ade78740e73acf25a8035e5
Commit Graph

11393 Commits

Author SHA1 Message Date
nik707
8a4e44758f Merge pull request #10165 from Ghommie/Ghommie-cit456 
Minor underwear fixes and tweaks.
 2019-12-30 18:28:48 -06:00
nik707
23f79ffed8 Merge pull request #10123 from Citadel-Station-13/throwing_disarm_stuff 
throwing now only randomly turns things if you are on harm intent
 2019-12-30 18:28:16 -06:00
Ghom
775ddb61e6 Merge pull request #10301 from Trilbyspaceclone/patch-249 
Buffs Engine Goggles a lot!
 2019-12-30 22:23:46 +01:00
Putnam
d78ebd15f3 amazing. 2019-12-30 12:38:38 -08:00
Ghom
d3bf4bbb8c Merge pull request #10306 from Arturlang/patch-2 
Removes most of vampire armor and removes stun scaling, and associates the buffs with physiology
 2019-12-30 20:11:34 +01:00
Arturlang
0776cade21 Ghommies fixes 2019-12-30 20:18:49 +02:00
Ghom
e309497af2 Merge pull request #10339 from Seris02/teleivdrip 
telescopic IV drips
 2019-12-30 18:24:50 +01:00
Seris02
9653dc470b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc 2019-12-30 22:48:39 +08:00
Ghom
20de4dfe50 Merge pull request #10333 from Trilbyspaceclone/patch-255 
Makes grass distill into light beer
 2019-12-30 11:18:20 +01:00
Trilbyspaceclone
24d4684afb Maybe he means this? 2019-12-30 03:56:44 -05:00
kevinz000
fef66b1bd7 Merge pull request #10320 from Seris02/exclusion 
excludes certain ghost roles from being affected by health events
 2019-12-30 00:26:19 -08:00
kevinz000
eb00538843 Merge pull request #10331 from Trilbyspaceclone/patch-254 
Buffs borg hypo's
 2019-12-30 00:20:35 -08:00
kevinz000
ae77577ed3 Merge pull request #10239 from Ghommie/Ghommie-cit480 
Fixing a few consistency issues with Nightmares.
 2019-12-30 00:15:03 -08:00
kevinz000
97aadba950 Merge pull request #10259 from Citadel-Station-13/revert-10126-he-tweaks 
Revert "Makes HE pipes realistically radiate away heat"
 2019-12-30 00:13:45 -08:00
kevinz000
80606f42ac Merge pull request #10334 from keronshb/REFLECTORBLOBPORT 
Ports reflector blobs
 2019-12-30 00:11:50 -08:00
kevinz000
0dc55b209a Merge pull request #10336 from ItzGabby/Poly-Collar-UI-Fix 
Fixes UI for poly collars
 2019-12-30 00:11:27 -08:00
kevinz000
74edd7b13f Merge pull request #10243 from Putnam3145/lewdchem-better-options 
Lewd chem sanity pass/"ERP preferences"
 2019-12-30 00:09:18 -08:00
kevinz000
3f4594d78e Merge pull request #10312 from Commandersand/prayfornoconflictslel 
ports rp dresses/pants/chaps, available through loadout or vendors(without breaking my github branch)
 2019-12-30 00:07:32 -08:00
kevinz000
47c92e380c Merge branch 'master' into throwing_disarm_stuff 2019-12-30 00:05:17 -08:00
kevinz000
310d343242 Merge pull request #10095 from Ghommie/Ghommie-cit443 
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
 2019-12-30 00:03:21 -08:00
Putnam3145
640419eed5 Merge pull request #10343 from Ghommie/Ghommie-cit494 
[s] Fixes anti-ghost-role vars a little.
 2019-12-29 20:54:55 -08:00
Seris02
f1292c503c makes it a trait 2019-12-30 11:33:15 +08:00
Ghommie
0ab817c208 [s] Fixes ghost anti-ghostrole timers a little. 2019-12-29 22:22:20 +01: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
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
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
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
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