shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,353 Commits 5 Branches 0 Tags
d0d6bc37a6788ed3d6ae3cc2d9401ac48dcf70e6
Commit Graph

8730 Commits

Author SHA1 Message Date
kevinz000 32f6427cf1 Merge pull request #8434 from Ghommie/Ghommie-cit16 
I'm tired of my pulls on horizontal spacemen breaking off because of crawling delays.
 2019-05-31 18:00:47 -07:00
kevinz000 8b27926fee Merge pull request #8463 from Trilbyspaceclone/metal_shields 
Makeshift Metal shield crafting
 2019-05-31 18:00:12 -07:00
kevinz000 140e065525 Merge pull request #8495 from BurgerLUA/Anti-Obese 
Obesity is now a warning instead of a notice.
 2019-05-31 17:59:09 -07:00
kevinz000 59e88e0808 Merge pull request #8477 from deathride58/portsnerditems 
Ports the zulie cloak and blackredgold coat donor items from RP
 2019-05-31 17:58:48 -07:00
kevinz000 7507831ffa Merge pull request #8449 from Trilbyspaceclone/patch-144 
Makes PDA bomb cart cost 5 not 6
 2019-05-31 17:52:40 -07:00
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
Trilbyspaceclone ddfe9812a1 Update shotgun.dm 2019-05-31 16:06:26 -04:00
BurgerLua 5f94441cc7 Adds Clockwork Reflectors 2019-05-30 22:52:43 -07:00
BurgerLua 5dc3542f90 added 2019-05-30 15:49:53 -07:00
Trilbyspaceclone c73884aea4 huh... 2019-05-30 16:12:40 -04:00
Trilbyspaceclone 751b9adb53 Update recipes.dm 2019-05-30 16:10:10 -04:00
Ghommie fa4cf533cb honestly AP bullet spam is ballocks too. 2019-05-30 20:20:05 +02: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
Ghommie 85ab988842 0, null, and "", all fulfill the ! operator. 2019-05-30 20:09:19 +02:00
Trilbyspaceclone a8ec60d9c1 Update miscellaneous.dm 2019-05-30 13:51:55 -04:00
kevinz000 e75e629a8a Update code/modules/antagonists/changeling/powers/adrenaline.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-05-30 10:32:02 -07:00
Coolgat3 674e8a4227 Glubbs 2019-05-30 18:59:43 +02: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
Useroth d8d9d6efeb Tweaks. Also, eating human pies makes them chestburst you a'la monkey cubes. 2019-05-29 23:45:25 +02:00
BlackMajor 93464b8f24 Adds bluespace compression kit 2019-05-30 02:46:34 +12:00
Ghommie 8fbc25ad77 Ports in combat gloves plus. 2019-05-29 16:35:56 +02:00
Useroth 16826eba66 Tweaks n' stuff. 2019-05-29 08:45:21 +02:00
deathride58 3feb11f12a Ports the zulie cloak and blackredgold coat donor items from RP 2019-05-28 19:38:08 -04:00
Trilbyspaceclone 5ead987d53 Update hierophant.dm 2019-05-28 19:01:32 -04:00
Trilbyspaceclone 69a39b4f67 Update hierophant.dm 2019-05-28 18:56:16 -04:00
kevinz000 8cd0b69b61 adrenals 2019-05-28 01:00:41 -07:00
Useroth 848f3910e6 Oops. Now it compiles fine. 2019-05-28 09:32:59 +02:00
Useroth eb6e710b18 Forgot to uncomment the clown check on the shoes. 2019-05-28 09:17:03 +02:00
Useroth bd4108c094 ... 2019-05-28 09:04:13 +02:00
Useroth 939eb35a3f Tae-clown-do v1 2019-05-28 09:02:26 +02: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 031779a944 32 --> 25 2019-05-27 14:28:17 -07:00