Commit Graph

16414 Commits

Author SHA1 Message Date
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
kevinz000
8c93e48a01 Merge pull request #8896 from Bapldap/patch-1
Updates Blood Brother
2019-07-20 11:51:54 -07:00
kevinz000
3fada5c624 Merge pull request #8922 from BurgerLUA/Voting-Transparency
Gamemode Voting Results are now displayed at the end of round screen
2019-07-20 11:50:21 -07:00
kevinz000
08d9732fb8 Merge pull request #8925 from BurgerLUA/Autolathe-Fix
Makes the autolathe shock wire actually shock you
2019-07-20 11:49:39 -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
kevinz000
94f5573e3a Update nanites.dm 2019-07-19 17:45:44 -07: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
Ghommie
12f2b767ab removes stamina-free spammability. 2019-07-19 21:23:07 +02:00
Ghommie
b87442e633 Tones down some items attack stamina costs. kills hypereutactic blades copypasta. 2019-07-19 20:09:16 +02:00
Fermi
4ab5060596 Adds secbats (tested) 2019-07-19 17:07:02 +01:00
BurgerLua
b2379198aa Makes the autolathe shock wire actually shock you lmao 2019-07-19 02:01:16 -07:00
Fermi
fbf542134a Cidadel makes me want to hurt myself. 2019-07-19 05:18:35 +01:00
Fermi
a5fcb918aa Astrogen tweaks and cat fixes. 2019-07-19 04:11:26 +01:00
BurgerLua
9d183beb9c Added 2019-07-17 18:15:55 -07:00
Ghommie
44063e523d missing flag. 2019-07-18 02:14:00 +02:00
kevinz000
fd1eecc996 Update click.dm 2019-07-17 15:26:15 -07: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
deathride58
7b39c0935c Merge pull request #8415 from Citadel-Station-13/sprint_stamina
Adds a sprint buffer - 35 tiles, regen 2 tiles/second (always active), 0.3 stamcost per tile if empty (as old) directly applied to staminaloss rather than stamina action buffer (unlike old)
2019-07-17 18:07:57 -04: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
deathride58
2970ee54a9 fix ur code catman 2019-07-17 18:05:34 -04: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
77360259ae Merge pull request #8855 from Citadel-Station-13/kevinz000-patch-15
Fixes and buffs nano-boost symptom
2019-07-17 17:53:02 -04:00
deathride58
7e12cfc9ff Merge pull request #8868 from Citadel-Station-13/kevinz000-patch-57
Nanites in non /livings are no longer immune to EMPs
2019-07-17 17:51:15 -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
d7cbbfc8a4 Merge pull request #8866 from Citadel-Station-13/kevinz000-patch-54
Fixes nanites getting instant nuked by EMPs and shocks and removes the random drain in favor of a scaled drain
2019-07-17 17:48:38 -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
9ebdad68b7 Merge pull request #8892 from Citadel-Station-13/kevinz000-patch-61
Fixes RPD infinite transit tube stacking
2019-07-17 17:47:09 -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
05d839029a Late night coding that was yesterday's. 2019-07-17 16:03:05 +02:00
Ghommie
b818b1eedd Updating spraycans and crayons code. 2019-07-17 15:45:48 +02:00
kevinz000
b134d23ea3 Merge pull request #8882 from Trilbyspaceclone/slaggy
Adds discount plushies and a way to get random plushies at shift start
2019-07-17 00:50:21 -07:00
TrilbySpaceClone
ba63926905 Sitting on the job 2019-07-16 22:42:57 -04: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