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

17657 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
nik707 be9912227f Merge pull request #10372 from Hatterhat/the-one-with-the-forcefields 
forcefield projectors on toolbelts, cool and good sprites for atmos holofan/forcefield proj
 2020-01-01 20:28:15 -06:00
Lin c836889944 Merge pull request #10370 from Hatterhat/blood-drunk-cripple-bad 
blood drunk buff probably shouldnt cripple you
 2020-01-01 21:21:39 +00: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
kevinz000 1051d99fdf Merge pull request #10361 from CameronWoof/fashion-ghosts 
Ghost Cafe patrons now spawn with chameleon kits
 2019-12-31 19:28:55 -08:00
CameronWoof 58e50de434 grampa ghommles doesn't like kids and their newfangled technology and also the VA denied his claim and now he hates bureaucracy 2019-12-31 17:44:18 -08:00
Lin b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
Ghom cba4bc27ef Merge pull request #10349 from KathrinBailey/CE-locker 
CE Locker Vengeance: The Removaling + Welding locker consistency changes + Empty lockers for mappers
 2019-12-31 18:01:23 +01:00
KathrinBailey 243aebe12a dab 2x 2019-12-31 16:54:59 +00:00
KathrinBailey 0a19f62fa9 dab 2019-12-31 16:45:06 +00:00
KathrinBailey f2e9ba2a8e Makes lockers into subtypes 
Adds new lockers cleanly at the bottom instead and as subtypes.
 2019-12-31 16:41:23 +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 0453363d4c Merge pull request #10345 from Trilbyspaceclone/patch-256 
Buffs bandoliers to hold more types of casings.
 2019-12-31 14:36:53 +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 5a497b02ac hey i'm WALKIN here 2019-12-31 01:56:01 -06:00
Hatterhat 76e789d3d1 getting limb crippled is a 4head bruh 2019-12-31 00:14:52 -06: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
Lin b3144c7570 Merge pull request #10365 from Putnam3145/fix-prefs 
[s] prefs broke i fix
 2019-12-31 04:12:55 +00:00
Putnam 0b60b121c2 afwafwadjiwao 2019-12-30 19:34:57 -08:00
kevinz000 79c609aa40 Update telescopic_iv.dm 2019-12-30 17:55:59 -08: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
CameronWoof d8c9dd967b Dolly Dress-Up: Ghost Hunter Edition 2019-12-30 14:31:47 -08: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 f0ba93052d yee2. 2019-12-30 23:53:10 +08:00
Seris02 bebd1a4600 yee. 2019-12-30 23:52:36 +08: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