Commit Graph

8148 Commits

Author SHA1 Message Date
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
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
kevinz000
6ed955ddde Update beams.dm 2019-05-27 14:25:45 -07:00
kevinz000
4913f332c7 Update stun.dm 2019-05-27 14:23:29 -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
689077a54d grammar 2019-05-27 04:57:10 -04:00
Trilbyspaceclone
a244bf33f7 Update recipes.dm 2019-05-27 04:39:06 -04:00
Trilbyspaceclone
1b48db693f Update shotgun.dm 2019-05-27 02:42:46 -04: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