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

11442 Commits

Author SHA1 Message Date
Hatterhat 5b99524e82 Revert "Makes the efficiency of the TEG be dependant on how much gas is actively combusting in the hot pipe" 2020-01-01 20:44:48 -06:00
nik707 1e6a485976 Merge pull request #10368 from Hatterhat/orm-laser-fix-question-mark 
ORM lasers actually affect point return
 2020-01-01 20:32:48 -06:00
nik707 75d5e324ec Merge pull request #10379 from Hatterhat/tg-47443-shotgunpbs 
shotgun pointblanking people actually throws them
 2020-01-01 20:32:16 -06:00
nik707 e232b13119 Merge pull request #10369 from Hatterhat/patch-4 
crusher trophy drop chance increase
 2020-01-01 20:28:35 -06:00
kevinz000 68bc6dcc2a Update megafauna.dm 2020-01-01 02:43:43 -08:00
Hatterhat 0374870c41 bulldogs knockback too 2020-01-01 02:04:03 -06:00
Hatterhat 318a6812c3 manually copied tgstation#47443 2019-12-31 21:38:11 -06:00
kevinz000 ec67a38093 Merge pull request #10330 from keronshb/keronnanite 
More nanites from /tg/station
 2019-12-31 19:32:05 -08:00
kevinz000 c222ea0bb3 Merge pull request #10356 from deathride58/sprintprefs 
Adds space to sprint and toggle sprint as preferences
 2019-12-31 19:29:47 -08:00
Lin b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
Ghom 93e090d229 Merge pull request #10309 from Seris02/disablerglasses 
disabler sechuds, let the adminbus commence
 2019-12-31 14:43:39 +01:00
Ghom 4660465115 Merge pull request #10362 from Trilbyspaceclone/patch-258 
Corrects bottle/pill/patch/condiments "#$39;"
 2019-12-31 14:39:34 +01:00
Ghom 78e4c608ad Merge pull request #10319 from Seris02/coconutsyep 
porting azarak's coconuts from hyper station
 2019-12-31 13:16:07 +01:00
Hatterhat 4c5f6f895b tgstation 42481 2019-12-31 00:07:36 -06:00
Hatterhat ff8a86d05a squashing is hell but orm lasers work 2019-12-30 23:50:49 -06:00
Seris02 46c68f8fd8 Update code/modules/hydroponics/gene_modder.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-31 09:34:22 +08:00
Seris02 2e8c671a2f Update code/modules/hydroponics/seeds.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-31 09:34:15 +08:00
Seris02 5e403dd0a7 Update code/modules/hydroponics/seeds.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-31 09:34:03 +08:00
Arturlang c4caa54608 Oh god oh fuck 2019-12-31 03:23:14 +02:00
nik707 70d03a7870 Merge pull request #10344 from Ghommie/Ghommie-cit495 
chestbursters deleting brains fix.
 2019-12-30 18:31:34 -06:00
nik707 5c13fa64e3 Merge pull request #10338 from Seris02/marshmallow 
marshmallow
 2019-12-30 18:31:06 -06:00
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
Trilbyspaceclone ea43069222 Update chem_master.dm 2019-12-30 18:05:34 -05: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
deathride58 5c9c9d9566 Adds space to sprint and toggle sprint as preferences 2019-12-30 15:32:15 -05: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
Seris02 1030698c10 did this actually change anything 2019-12-30 21:18:05 +08:00
Seris02 84574a150b weh 2019-12-30 21:00:25 +08:00
Seris02 8bb7a4a40d hnnnng 2019-12-30 19:24:07 +08:00
Seris02 bc2e4f3b5a desc 2019-12-30 19:08:37 +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 40730b48d5 few fixes 2019-12-30 11:49:16 +08:00
Seris02 f1292c503c makes it a trait 2019-12-30 11:33:15 +08:00