Commit Graph

43334 Commits

Author SHA1 Message Date
AnturK a384da6345 Fixes clothes getting damaged twice in explosions. (#38435) 2018-06-13 05:24:42 -04:00
Dax Dupont 4e3eff4f73 Equalizes thresholds on being fat (#38383) 2018-06-13 03:56:24 -04:00
Armhulen 82c2bffe9d Adds a new drink: Peppermint Patty from Archer! (#38427)
* Sprites!

*  S_______ W________

* Candyland snuck into pr... Check!

* removal of candyland extract

* candyland but not the sprites yet.

* fixes :)

* Whoops, lets fix that too
2018-06-13 03:49:44 -04:00
XDTM af50573d85 Virus crates now contain randomly generated viruses instead of single-symptom advance presets (#38412)
* Virus crates now contain randomly generated viruses instead of single-symptom advance presets

* fix

* mapswap
2018-06-13 00:44:19 -07:00
Mickyan eb9fa0d8f5 Add pacifism check for screwdriver/bottle attacks (#38416) 2018-06-13 00:22:26 -07:00
XDTM a1037d1039 Androids are immune to radiation (#38420) 2018-06-13 00:17:27 -07:00
Jordan Brown fda578cc22 Legacy config warning only happens if any legacy configs are present (#38421) 2018-06-12 19:19:00 -07:00
oranges beb3c89cc6 Merge pull request #38429 from AnturK/runtimeA
[s] Fixes sleeper logging.
2018-06-13 10:49:58 +12:00
Jordan Brown 9089af581d Merge pull request #38414 from XDTM/cold_never_bothered_me_anyway
RESISTCOLD trait now prevents damage and slowdown from cold, instead of preventing cold itself
2018-06-12 18:16:53 -04:00
Jordan Brown b8460c7b81 Merge pull request #38415 from XDTM/master_of_disguise
[s]Diseases lose scan invisibility if their stealth drops below the threshold
2018-06-12 11:50:41 -04:00
Jordan Brown 3dcf793cc7 Merge pull request #38422 from DaxDupont/hydroponics
[s] Fixes exploit where botany trays can be refilled at no cost.
2018-06-12 11:45:15 -04:00
Jordan Brown 55be4c1944 Merge pull request #38413 from Tlaltecuhtli/patch-45
Add a missing space in mechacode
2018-06-12 11:37:02 -04:00
AnturK 57dd33a04b Fixes sleeper logging. 2018-06-12 09:46:11 +02:00
kevinz000 e96b3b438c Fixes unintentional vehicle buff (#38404) 2018-06-11 22:57:20 -07:00
oranges 496c311f7f Merge pull request #38367 from AutomaticFrenzy/patch/pull-diagonally
Fix pulling diagonally looking goofy
2018-06-12 11:49:25 +12:00
oranges 75575f4ae8 Merge pull request #38366 from AutomaticFrenzy/patch/fire-overlay
Replace area-wide fire overlay with reddening the lights
2018-06-12 11:48:47 +12:00
oranges fb6a61b5cb Merge pull request #38360 from ShizCalev/key-cleanup
Cleans up some logging
2018-06-12 11:48:21 +12:00
oranges 9b3561e805 Merge pull request #38382 from AutomaticFrenzy/patch/squash-no-markup
Make chat squashing HTML-agnostic II
2018-06-12 11:46:37 +12:00
oranges 124d9b081c Merge pull request #38380 from AutomaticFrenzy/patch/vr-plasmemes
Give plasmamen their plasma suits in VR
2018-06-12 11:46:26 +12:00
oranges 5a079bae42 Merge pull request #38378 from AutomaticFrenzy/patch/deaf-borg-mods
Fix deaf people hearing borg modules going offline
2018-06-12 11:45:56 +12:00
oranges 009a303651 Merge pull request #38377 from AutomaticFrenzy/patch/splash-runtime
Fix a runtime when clicking the splash screen fadeout
2018-06-12 11:44:42 +12:00
oranges de389ee586 Merge pull request #38376 from AutomaticFrenzy/patch/lockbox
[s] Fix lockboxes not actually being locked
2018-06-12 11:44:24 +12:00
Jordan Brown 88cad42812 Merge pull request #38381 from AutomaticFrenzy/patch/orb-of-confusion
Fix legion cores not healing confusion
2018-06-11 16:51:02 -04:00
AnturK 7f887bc4ea Removes doubled iaa definition. 2018-06-11 22:16:10 +02:00
Dax Dupont 4102790da6 [s] Fixes exploit where botany trays can be refilled at no cost. 2018-06-11 19:15:31 +02:00
AnturK fd656d3623 Fixes nuke exploding instantly. (#38417) 2018-06-11 17:16:00 +03:00
XDTM 4dc129d8fa Diseases lose scan invisibility if their stealth drops below the threshold 2018-06-11 15:27:40 +02:00
XDTM fa6c0dd393 chill 2018-06-11 14:42:06 +02:00
Tlaltecuhtli cb3122d002 improves my gbp bank 2018-06-11 14:41:11 +02:00
XDTM 9cde3a65c6 RESISTCOLD trait now properly prevents damage and slowdown 2018-06-11 14:38:26 +02:00
XDTM 1ca5febe38 Anti-magic component start enabled (#38388) 2018-06-10 22:15:57 -07:00
ShizCalev 753752180c Makes swimsuits underwear (#38372) 2018-06-10 22:13:51 -07:00
fludd12 b2e9fe8728 Fixes and Upgrades Stabilized Gold Extracts (#38394)
* Fixes and Upgrades

* I Forgot To Sync This Whoops

* If You Say So
2018-06-10 22:03:55 -07:00
ShizCalev 0fdc645067 Adds logging for sleeper chem injections (#38396) 2018-06-10 22:03:30 -07:00
Jordan Brown 4d69d36b9a Merge pull request #38379 from MrStonedOne/fasternotes
Fixes note/message interface flooding the string tree.
2018-06-10 11:50:51 -04:00
AnturK 8c606af6cf Squashes traitors under one path (#38332) 2018-06-10 03:05:53 -07:00
kevinz000 c38e4c938d Make incendiary armor aspawn only (#38370) 2018-06-10 02:56:39 -07:00
AnturK f7cf151e92 Fixes loading zlevels with static lighting. (#38365)
* Fixes loading zlevels with static lighting.

* Actually this whole part is unnecessary now because change turf handles the change properly now.

* Correct
2018-06-10 02:54:53 -07:00
kevinz000 bddba58241 Readds actual fun to admins throwing around drop pods (#38374)
* Readds fun

* Fun
2018-06-10 02:53:55 -07:00
ShizCalev 3abd2b6d27 Cleans up logging 2018-06-09 15:51:58 -04:00
MrStonedOne 0814e09bd5 Fix warning. 2018-06-09 11:24:34 -07:00
Jordan Brown 9a5859a977 Merge pull request #38358 from nfreader/record_crimes
Logs minor and major crimes
2018-06-09 13:21:36 -04:00
Jordan Brown 7accb5b093 Merge pull request #38361 from AnturK/yeahno
Removes unused overview code.
2018-06-09 13:20:06 -04:00
Tad Hardesty ae5c744b54 Make chat squashing HTML-agnostic 2018-06-09 02:45:56 -07:00
Tad Hardesty f3ae5a1a67 Fix legion cores not healing confusion 2018-06-09 01:55:59 -07:00
Tad Hardesty 8c515d8d99 Give plasmamen their plasma suits in VR 2018-06-09 01:17:14 -07:00
MrStonedOne 7f323c1dfe Fixes note interface flooding the string tree. 2018-06-08 23:42:57 -07:00
Tad Hardesty 86a0056057 Fix deaf people hearing borg modules going offline 2018-06-08 23:29:14 -07:00
Tad Hardesty 24bd9ce572 Fix a runtime when clicking the splash screen fadeout 2018-06-08 23:27:07 -07:00
Tad Hardesty 106f5af48b Fix lockboxes not actually being locked 2018-06-08 23:22:12 -07:00