Commit Graph

8788 Commits

Author SHA1 Message Date
kevinz000 0f58585e5d Merge pull request #8939 from Ghommie/Ghommie-cit154
Fixing towels and improving them.
2019-07-23 20:34:09 -07:00
Trilbyspaceclone 359d0e8531 Update lungs.dm 2019-07-23 01:27:03 -04:00
kevinz000 1028fe458a Merge pull request #8909 from Ghommie/Ghommie-cit143
Fixes named arg Knockdown calls.
2019-07-22 20:17:30 -07:00
kevinz000 f114094138 Merge pull request #8926 from Thalpy/Secbats
Secbats
2019-07-22 20:15:36 -07:00
Chayse Ramsay 1c8768afe4 Redundant Redundancies made Redundant 2019-07-22 19:31:42 +01:00
Chayse Ramsay ede61d8cb2 Changes the Warden's shotgun to instead be foldable, with greatly increased recoil and spread while folded. 2019-07-22 00:55:41 +01:00
Ghommie 57d5ddb80f removed extra broken bottle strength. 2019-07-21 12:20:10 +02:00
Ghommie c06c1d9b60 typo. 2019-07-21 12:11:18 +02:00
Ghommie ce4e86279c Further improvements. 2019-07-21 11:58:58 +02:00
Ghommie 5504fb6a6a Alt click examine string. 2019-07-21 11:27:26 +02:00
Ghommie 2f46b68e11 switching to non combat mode attack_self() and AltClick(), less clunky. 2019-07-21 11:22:19 +02:00
Ghommie e8584720b3 Fixes suit worn overlay for towels. 2019-07-21 11:18:38 +02:00
Ghommie 1a47fedade More intuitive, way less weird edge cases. 2019-07-21 10:26:16 +02:00
Ghommie fc78d02242 Fixing towels and improving them. 2019-07-21 09:58:54 +02:00
Fermi 4f2406ee3a Made it a critterbox instead. 2019-07-20 20:55:46 +01:00
Fermi c2b3df34c1 Cargobox. 2019-07-20 20:46:50 +01:00
kevinz000 c657244d9b Merge pull request #8920 from Ghommie/Ghommie-cit149
Towels.
2019-07-20 12:06:54 -07:00
kevinz000 66ddaf3ae8 Merge pull request #8903 from Trilbyspaceclone/patch-192
Re-words brass flasks to not be wrong
2019-07-20 11:59:30 -07:00
kevinz000 ab3c5acb0e Merge pull request #8829 from BurgerLUA/NO-MORE-FETISH-CONTENT
Changeling Transformation Sting (transforming others) is now temporary, just like this server's love for transformation fetishes
2019-07-20 11:59:05 -07:00
kevinz000 08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114
Ports the toggleable dark mode to the game!
2019-07-20 11:57:13 -07:00
kevinz000 3176cf958f Merge pull request #8917 from deathride58/fuckwarpwhistles
Fixes warp whistles
2019-07-20 11:54:48 -07:00
kevinz000 f649920b49 Merge pull request #8898 from WhiteHusky/batch-check-injuries
Batch check injuries
2019-07-20 11:52:45 -07:00
TrilbySpaceClone 0a8954c2d6 Update packs.dm 2019-07-19 23:53:12 -04:00
TrilbySpaceClone d981b756e3 Update packs.dm 2019-07-19 23:49:53 -04:00
Fermi e5648fd471 Made bat part of previous bat type. 2019-07-19 22:57:22 +01:00
Fermi 75d6768ba7 Changed how the box works so it's not a storage. 2019-07-19 22:12:05 +01:00
Ghommie 7065a86841 Revert "Revert "Fixes rocket launchers, buffing their accuracy etc."" 2019-07-19 22:02:22 +02:00
Fermi 4ab5060596 Adds secbats (tested) 2019-07-19 17:07:02 +01:00
Ghommie 44063e523d missing flag. 2019-07-18 02:14:00 +02:00
Ghommie 4e6554076c item flags, not clothing flags. 2019-07-18 00:16:14 +02:00
kevinz000 28ac38d800 Merge pull request #8910 from Ghommie/Ghommie-cit144
Ports "Removes some getflaticon calls from things that don't draw browser interfaces"
2019-07-17 15:08:36 -07:00
kevinz000 884299e152 Merge pull request #8915 from Ghommie/Ghommie-cit148
Gives cult conversions an alert popup and four extra seconds wait time.
2019-07-17 15:07:38 -07:00
Ghommie 589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
deathride58 edbcabdce4 Merge pull request #8836 from Citadel-Station-13/kevinz000-patch-55
nanite metabolic synthesis now drains you until you're starving
2019-07-17 17:55:27 -04:00
deathride58 adaac8322c Merge pull request #8589 from Citadel-Station-13/kevinz000-patch-47
buffs pepperspray to hardstun (knockdown + drop items) for 0.1 ds because for some reason we don't have a standalone knockdown without hardstun when are we porting the /tg/ mobility flags that I made?
2019-07-17 17:53:39 -04:00
deathride58 80b1383362 Merge pull request #8865 from Citadel-Station-13/kevinz000-patch-53
adds an adminspawned nanite hub that draws from admin techweb datum instead
2019-07-17 17:50:46 -04:00
deathride58 51665f0d5f Merge pull request #8863 from Citadel-Station-13/kevinz000-patch-51
Makes aggressive replication not useless
2019-07-17 17:49:08 -04:00
deathride58 8f41a29697 Merge pull request #8867 from Citadel-Station-13/kevinz000-patch-56
Nerfs chain detonation (removes dev radius)
2019-07-17 17:47:36 -04:00
deathride58 c36f25144b Merge pull request #8890 from Citadel-Station-13/kevinz000-patch-59
Nerfs nanite armor
2019-07-17 17:46:41 -04:00
kevinz000 70d7ebbb45 Merge pull request #8881 from Ghommie/Ghommie-cit134
Fixing a reagent ID typo.
2019-07-17 14:44:54 -07:00
BurgerLUA 03ef2c5257 Merge branch 'master' into NO-MORE-FETISH-CONTENT 2019-07-17 14:17:33 -07:00
deathride58 ea5837bfb1 double the sanity check, double the stability 2019-07-17 16:54:02 -04:00
deathride58 42aae8f45f fixing warp whistles in literally two fucking lines 2019-07-17 16:49:46 -04:00
Trilbyspaceclone bc158f4fd8 Update code/modules/food_and_drinks/drinks/drinks/bottle.dm
weh

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-07-17 16:39:14 -04:00
Ghommie 9384af188e Gives cult conversions an alert popup and a couple extra seconds. 2019-07-17 17:50:54 +02:00
Ghommie 8bd64598c5 umh mh... 2019-07-17 01:32:33 +02:00
Ghommie 408c9aec51 Nothing the power of copypasta won't stop. 2019-07-17 01:01:33 +02:00
Ghommie ee32e1680f Ports "Replaces radio channel names and keys with defines" 2019-07-17 00:52:41 +02:00
Ghommie c7db3ad8f9 Porting a couple atmos performance improvements. 2019-07-16 23:51:38 +02:00
Ghommie 676186ee36 Ports "Removes some getflaticon calls from things that don't draw browser interfaces" 2019-07-16 23:15:52 +02:00