shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,777 Commits 5 Branches 0 Tags
c645d2129f04d962f91de85610062e5ce59cb9f8
Commit Graph

7977 Commits

Author SHA1 Message Date
kevinz000
c645d2129f Merge pull request #8453 from Trilbyspaceclone/patch-148 
Tuberculosis 12tc - > 8tc
 2019-05-31 17:52:25 -07:00
kevinz000
4224606c5f Merge pull request #8452 from Trilbyspaceclone/patch-147 
Makes mulligan cost only 3
 2019-05-31 17:50:59 -07:00
kevinz000
61f9c2edcd Merge pull request #8461 from Trilbyspaceclone/patch-155 
Makes golden toolboxes cost 3 not 5
 2019-05-31 17:47:08 -07:00
kevinz000
14d763bd1d Merge pull request #8459 from Trilbyspaceclone/patch-153 
Syndicate Sentience Potion costing 2 from 4
 2019-05-31 17:46:44 -07:00
kevinz000
8c6d8eb20b Merge pull request #8471 from Sishen1542/buttslol 
Butt slaps fix & Masochism! (fixed)
 2019-05-31 17:45:07 -07:00
kevinz000
854eb129f6 Merge pull request #8462 from Trilbyspaceclone/patch-156 
Makes brainwash disks cost 3 tc not 5
 2019-05-31 17:43:53 -07:00
kevinz000
1efdfd38e0 Merge pull request #8436 from Trilbyspaceclone/patch-137 
Allows bio genes to make synth meat
 2019-05-31 17:43:22 -07:00
kevinz000
f678741a0e Merge pull request #8470 from Ghommie/Ghommie-cit19 
Undunks pepper spray & teargas.
 2019-05-31 17:42:28 -07:00
kevinz000
ca16cd9467 Merge pull request #8488 from Trilbyspaceclone/ERT_SUITS 
[Ready] High alarm ERT suits
 2019-05-31 17:41:39 -07:00
kevinz000
a96e414d2f Merge pull request #8486 from BlackMajor/Ooga 
Supermatter no longer works while inside of a turf.
 2019-05-31 17:40:30 -07:00
kevinz000
f5b3484e92 Merge pull request #8295 from Trilbyspaceclone/T_T 
[Ready] Nerfs(Not really) Engi printing and organized many designs
 2019-05-30 11:12:35 -07:00
Trilbyspaceclone
a8ec60d9c1 Update miscellaneous.dm 2019-05-30 13:51:55 -04:00
Trilbyspaceclone
39700503f9 Update miscellaneous.dm 2019-05-30 11:40:37 -04:00
Trilbyspaceclone
618c2c070c Update ert.dm 2019-05-30 11:36:20 -04:00
BlackMajor
0d06605662 Supermatter eats the closed turf it's inside. 
Because /turf/closed doesn't respect atmos and an SM engine in a plasmafire unharmed because it's inside a turf is questionable.
 2019-05-30 16:17:33 +12:00
Sishen1542
c57968ec13 Update code/modules/mob/living/carbon/human/species.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-05-28 00:29:56 -04:00
Sishen
6707d1b2fd Update species.dm 2019-05-27 23:24:52 -04:00
Sishen1542
0a11e98950 Update code/modules/mob/living/carbon/human/species.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-05-27 20:53:42 -04:00
Sishen1542
e07493b0fa Update code/modules/mob/living/carbon/human/species.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-05-27 20:53:35 -04:00
Sishen
8771ae5822 masochism and buttslap fixes 2019-05-27 18:51:52 -04:00
Ghommie
cc334b9a57 honestly if they don't wear a gas mask, they do deserve the stunlock... 
But ok.
 2019-05-28 00:43:54 +02:00
Ghommie
b5c4a44f01 pepper spray & teargas de-dunked. 2019-05-28 00:30:55 +02:00
kevinz000
aca63ebea3 Merge pull request #8408 from Ghommie/Ghommie-cit13 
Fixing cult rounds potentially stalling if the sac target is erased from this realm.
 2019-05-27 15:09:11 -07:00
kevinz000
76314e463e Merge pull request #8443 from deathride58/stripfix 
Item stripping no longer gets interrupted by changes in your actively held item
 2019-05-27 14:08:04 -07:00
kevinz000
ff82569c6f Merge pull request #8404 from WhiteHusky/flavor-text-bugfix 
Flavor text with special characters don't get partially unescaped
 2019-05-27 03:31:49 -07:00
kevinz000
843bfc3a3e Merge pull request #8427 from CalamaBanana/quick-fix-for-importing-custom-colored-circuits 
Removes color-whitelist blocking custom-colored circuit blueprints from being imported
 2019-05-27 03:30:07 -07:00
kevinz000
45146b28c8 Merge pull request #8456 from Trilbyspaceclone/patch-151 
suppressors now only cost 1 tc
 2019-05-27 03:27:22 -07:00
kevinz000
433d6cae4b Merge pull request #8455 from Trilbyspaceclone/patch-150 
Binary Translator Key costs 2 from 5
 2019-05-27 03:26:45 -07:00
kevinz000
625901bfe3 Merge pull request #8454 from Trilbyspaceclone/patch-149 
Adv Syndicate Surgery Duffel Bag tweaks
 2019-05-27 03:26:26 -07:00
kevinz000
2f79f36a38 Merge pull request #8448 from Trilbyspaceclone/patch-143 
Makes laser scatter shot cost 4 not 5
 2019-05-27 03:25:56 -07:00
kevinz000
b718460cf6 Merge pull request #8460 from Trilbyspaceclone/patch-154 
ultra clown fireing pins
 2019-05-27 03:24:47 -07:00
kevinz000
e20206a6cb Merge pull request #8450 from Trilbyspaceclone/patch-145 
Reduces FRAME cart by 2tc
 2019-05-27 03:23:33 -07:00
Trilbyspaceclone
962c5c7a17 Update uplink_items.dm 2019-05-26 22:53:00 -04:00
Trilbyspaceclone
6b05ccbda8 Update uplink_items.dm 2019-05-26 22:51:22 -04:00
Trilbyspaceclone
21ade7bb2c Update uplink_items.dm 2019-05-26 22:49:07 -04:00
Trilbyspaceclone
254e84e46b Update uplink_items.dm 2019-05-26 22:44:17 -04:00
Trilbyspaceclone
b28e374640 Update uplink_items.dm 2019-05-26 22:35:12 -04:00
Trilbyspaceclone
ea6b538d0b Update uplink_items.dm 2019-05-26 22:32:10 -04:00
Trilbyspaceclone
4138748616 Update uplink_items.dm 2019-05-26 22:29:55 -04:00
Trilbyspaceclone
a633d3202a It was 2019-05-26 22:22:31 -04:00
kevinz000
fa4e1f44ff Merge pull request #8438 from BurgerLUA/AssFix 
Ass Fix
 2019-05-26 19:19:13 -07:00
Trilbyspaceclone
2dde7e8451 Update uplink_items.dm 2019-05-26 22:18:56 -04:00
Trilbyspaceclone
7bc3aa4cf1 Update uplink_items.dm 2019-05-26 22:11:36 -04:00
Trilbyspaceclone
5a0c7df824 Update uplink_items.dm 2019-05-26 21:59:01 -04:00
Trilbyspaceclone
06bacf3436 Update uplink_items.dm 2019-05-26 21:52:28 -04:00
kevinz000
d4026d70ff Merge pull request #8435 from Ghommie/Ghommie-cit17 
lazyinitlist on IAA targets stealing.
 2019-05-26 17:23:05 -07:00
kevinz000
e204cdc84e Merge pull request #8419 from UntoldTactics/Cult-Changes 
Rewords Blood Cult 'offer' rune click here prompt.
 2019-05-26 17:22:43 -07:00
deathride58
375965d731 Item stripping no longer gets interrupted by changes in your actively held item 2019-05-26 16:22:15 -04:00
Trilbyspaceclone
5b549f030d huh... 2019-05-26 04:50:19 -04:00
BurgerLua
125db4c6b4 Added 2019-05-25 21:21:52 -07:00