Commit Graph

10311 Commits

Author SHA1 Message Date
Mark van Alphen ec588a653e Merge pull request #1728 from Fox-McCloud/view-range
Changes View Range to Default of 15x15
2015-08-14 06:03:50 +02:00
Fox-McCloud 1cce7c87be Merge pull request #1716 from Markolie/rndserver
Give syndi toolbox insulated gloves
2015-08-12 22:27:53 -04:00
Fox-McCloud aa9cf52467 Changes View Range to Default of 15x15 2015-08-12 18:01:24 -04:00
Fox-McCloud 427a4437e8 Merge pull request #1713 from Markolie/master
Fixes
2015-08-12 17:37:22 -04:00
Markolie eb84caaa90 Fix vending machine coin issue/runtime 2015-08-12 22:27:29 +02:00
Markolie f1a4cf1dcf SMES (de)construction fixes 2015-08-12 22:14:47 +02:00
Markolie 567aeb09b5 Remote control atmos fix 2015-08-12 21:38:21 +02:00
Mark van Alphen c8f5400c1c Merge pull request #1709 from Bram961/Kluysfluff
Kluys fluff item + Pirate coat fix
2015-08-12 18:25:45 +02:00
Mark van Alphen bc5f7ccb0c Merge pull request #1706 from Alex6511/master
Makes lethal injection syringes far more deadly
2015-08-12 18:24:46 +02:00
Mark van Alphen 20e9541358 Merge pull request #1721 from Krausus/CurseYouRelayMove!
Removes Unnecessary Relaymove
2015-08-12 18:23:46 +02:00
Markolie 362a817d79 Runtime and bug fixes 2015-08-12 18:20:53 +02:00
Krausus bfc3961350 Rips out unnecessary relaymove call on set machines
Also removes a sanity check that is no longer necessary.
2015-08-11 22:40:37 -04:00
Krausus 3c338056eb Fixes disposal gas mismanagement 2015-08-11 21:55:25 -04:00
Markolie d1e776a8f2 Give syndi toolbox insulated gloves 2015-08-12 02:26:21 +02:00
TheDZD 56af11019a Merge pull request #1708 from Markolie/caching
Caching
2015-08-11 17:42:57 -04:00
TheDZD 787caa613b Merge pull request #1707 from FalseIncarnate/master
Assorted Botany Fixes and Returns Accidentally Removed Features
2015-08-11 17:42:50 -04:00
Bram961 959ce69e15 Kluysfluff indentation 2015-08-11 21:52:40 +02:00
Bram961 7315d69c95 Kluysfluff second attempt 2015-08-11 21:39:06 +02:00
Bram961 0b77999c5c Kluys fluff item + Pirate coat fix
Adds in the nanofibre jacket, a jacket that can switch between being
concealed, jacket and coat mode.
Fixes the black pirate coat and its tiny white strip on one of the arms
that was meant to be part of the undersuit already in the game.
2015-08-11 21:06:29 +02:00
Markolie 7101ccde02 Further caching updates 2015-08-11 18:28:45 +02:00
Markolie ebdfeae887 Add caching to air alarms, apcs and power monitoring computers 2015-08-11 15:56:37 +02:00
Markolie 09fc2bc54f Add caching to crew monitor 2015-08-11 15:24:49 +02:00
TheDZD 621929cd65 Merge pull request #1698 from Fox-McCloud/pistachios
Adds Pistachio Snacks
2015-08-11 09:22:56 -04:00
FalseIncarnate 133b1233f9 Assorted Fixes and Returns Accidentally Removed Features
Fixes mutant plants not properly inheriting preset icons

Fixes preset icons incorrectly having a color overlay applied
- This was most noticeable on berries, as the color overlay would render
most of the icon black or red, instead of the intended multi-color icon

Returns emote capabilities to diona nymphs
- Accidentally removed by #1171

Returns Moonflowers, Novaflowers, Ghost Peppers, and Koi Beans
- Accidentally removed by #980
- Sunflowers can mutate into Moonflowers or Novaflowers
- Novaflowers contain pure welding fuel
- Moonflowers contain plantmatter and moonshine
- Chili peppers can mutate into Ghost Peppers or Ice Peppers
- Ghost Peppers contain plantmatter, capsaicin, and condensed capsaicin
- Soybeans can mutate into Koi Beans
- Koi Beans contain plantmatter and carpotoxin

Returns Hydroponics Harvests tracking for End-of-Round score
- Accidentally removed by #980

Updated the descriptions for plants to account for moonshine, welder
fuel, and carpotoxin
- This is to maintain consistency with other reagent-based descriptions
for the plants
2015-08-11 03:05:43 -04:00
Alex6511 b19d15b9cb Adjusted the drugs more. 2015-08-10 23:33:22 -04:00
Alex6511 f704e200b7 Update syringes.dm 2015-08-10 23:00:50 -04:00
Alex6511 5f5167ccfa Makes lethal injection syringes more deadly 2015-08-10 22:58:43 -04:00
Fox-McCloud 8528616bfd Merge pull request #1690 from Krausus/ForceHWGraphics
Forcibly Enable Hardware-Accelerated Graphics
2015-08-10 22:47:32 -04:00
Fox-McCloud d2d3dad6d6 Merge pull request #1687 from TheDZD/wiznerd2
Lightning Bolt Buff
2015-08-10 19:34:40 -04:00
Fox-McCloud 6b76e591f3 Merge pull request #1686 from Markolie/agentid
ID card/agent ID rework
2015-08-10 17:32:39 -04:00
Fox-McCloud ad2888f634 Merge pull request #1695 from Markolie/mapfix
Fix West Mining Outpost SMES
2015-08-10 17:29:14 -04:00
TheDZD 28623b44fb Merge pull request #1680 from Fox-McCloud/brain-eating
Removes Brain Eating
2015-08-10 14:41:27 -04:00
Fox-McCloud 0d810b5012 typo 2015-08-10 12:18:00 -04:00
TheDZD 625813286c Merge pull request #1699 from Markolie/rndserver
Fix RnD server deconstruction
2015-08-10 10:54:08 -04:00
Markolie 627c50c76b Fix RnD server deconstruction 2015-08-10 16:20:56 +02:00
Fox-McCloud 7ac65025bd Adds Pistachio Snacks 2015-08-10 01:56:50 -04:00
Markolie a088ffd1b8 Ghost fix revert 2015-08-10 05:21:04 +02:00
Fox-McCloud deafc93baa Dismemberment Tweaks 2015-08-09 22:11:37 -04:00
Fox-McCloud 48ee6f34aa Merge pull request #1683 from TheDZD/wiznerd
Adds Redtext Spans Classes to Staff of Animation
2015-08-09 20:41:21 -04:00
TheDZD c796628478 Merge pull request #1678 from Fox-McCloud/chemistry-tweaks
Chemistry Tweaks
2015-08-09 20:22:08 -04:00
Krausus a785c8373b Forces clients to use HW-accelerated graphics
They're forced on after a delay in client/New(), rather than Login(), to
minimize how often they occur and cause flickering.
2015-08-09 20:17:53 -04:00
TheDZD aadd7a4d9e Merge pull request #1675 from Fox-McCloud/welding-gas
Adds in Welding Gas Mask
2015-08-09 19:31:53 -04:00
DZD 68e8fb6162 Span changes 2015-08-09 19:23:49 -04:00
DZD 93df90d09f Lightning Bolt Buff
- Now always bounces 5 times (for a total of 6 hits).
- Now always does at least 15 damage per hit, with a maximum of 50.
- Now affects people wearing insulated gloves, tough luck if they're wearing an fully insulated chest-covering armor though.
2015-08-09 18:58:53 -04:00
Markolie a01d9e100c Make sure ghosts always use their correct icon/overlays rather than the generic white spooky scary ghost 2015-08-10 00:17:32 +02:00
Markolie 034cf8ef69 ID card/agent ID rework 2015-08-09 23:42:55 +02:00
Markolie 7ee077c17a Fix unnecessary space 2015-08-09 21:00:09 +02:00
Markolie cfe4fd4d88 Fix slime feeding exploit 2015-08-09 20:08:57 +02:00
Markolie f09584e99a Fix amputees picking up items, make sure viruses don't affect robotic limbs 2015-08-09 19:36:39 +02:00
Markolie a57e10e93d Convert xenomorph shuttle to proper multishuttle 2015-08-09 19:08:05 +02:00