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

11468 Commits

Author SHA1 Message Date
BlackMajor
08d042901c thank you github 2020-01-02 22:16:47 +13:00
BlackMajor
da3ab71222 Revert "Revert "Revert "Revert "Merge branch 'master' into Yeehaw"""" 
This reverts commit 74a646490f.
 2020-01-02 22:16:09 +13:00
BlackMajor
74a646490f Revert "Revert "Revert "Merge branch 'master' into Yeehaw""" 
This reverts commit 189e1af175.
 2020-01-02 22:15:40 +13:00
BlackMajor
189e1af175 Revert "Revert "Merge branch 'master' into Yeehaw"" 
This reverts commit 1b25996e55.
 2020-01-02 22:15:36 +13:00
BlackMajor
1b25996e55 Revert "Merge branch 'master' into Yeehaw" 
This reverts commit 490fb3ab61, reversing
changes made to aabb39a364.
 2020-01-02 22:15:31 +13:00
BlackMajor
490fb3ab61 Merge branch 'master' into Yeehaw 2020-01-02 22:13:52 +13:00
BlackMajor
aabb39a364 Revert "Merge branch 'master' into Yeehaw" 
This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.
 2020-01-02 22:06:31 +13:00
BlackMajor
30e3edaac1 Merge branch 'master' into Yeehaw 2020-01-02 22:03:58 +13:00
BlackMajor
3239acf74d Sync 2020-01-02 22:02:55 +13:00
kevinz000
67d9923ff7 Merge pull request #10371 from kappa-sama/patch-15 
call of duty loot boxes
 2020-01-01 22:08:20 -08:00
kevinz000
16172f68aa Merge pull request #10366 from Hatterhat/beaker-buff 
beaker buff - alt title fuck hypovials and fuck making them free and better alternatives to beakers
 2020-01-01 22:07:40 -08:00
nik707
a881231149 Merge pull request #10395 from Hatterhat/shit-and-cum 
space cola isnt a reagent idiot, codeside change only
 2020-01-01 20:45:33 -06:00
Hatterhat
1195762f86 space cola isnt a reagent idiot 2020-01-01 20:37:09 -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
Hatterhat
200de62b8e tweaks transfer amounts, uncucks hypovials 2020-01-01 08:50:15 -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
BlackMajor
8085022d97 Couple of changes. Starting on the point bank. 2019-12-31 23:28:30 +13:00
kappa-sama
c0bc53ea81 more 2019-12-31 01:43:42 -05:00
kappa-sama
970814adbc it begins 2019-12-31 01:42:07 -05: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
Hatterhat
dcb5c58784 hypovial users dont deserve rights 2019-12-30 22:33:40 -06:00
Hatterhat
dc339b6962 beaker capacity buff 2019-12-30 22:24:41 -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