Commit Graph

10683 Commits

Author SHA1 Message Date
oranges d17689e52a Merge pull request #32153 from tgstation/Cyberboss-patch-4
Removes force from slappers
2017-10-31 09:30:16 +13:00
Jordan Brown 8c8cdd7461 Merge pull request #32134 from Anonmare/patch-8
Makes rollerbeds normal-sized items
2017-10-30 16:09:22 -04:00
Jordan Brown 5bd01c8f14 Merge pull request #32146 from PKPenguin321/patch-20
Fixes rollies not being effective
2017-10-30 16:00:30 -04:00
Jordan Brown 677eefc462 Merge pull request #32211 from YPOQ/borgupgradefix
Fixes cyborg upgrades not applying to held items
2017-10-30 15:40:30 -04:00
kevinz000 8b9cb750db fixes radios being perma-stuck on when emped (#32212)
* fix radio emps

* woops forgot something!

* Update headset.dm
2017-10-30 15:38:24 -04:00
Jordan Brown 0b51afd858 Merge pull request #32215 from kevinz000/patch-363
fixes sinks applying baton stunforce to stutter without proper conversion between tick and mob life counting.
2017-10-30 15:37:03 -04:00
Ashe Higgs 695fa5f220 You can now hide grenades in plushies (#31986)
* Adds plushie grenades

* Now it compiles!

* Cyberboss' review

* Adds logging, handle_atom_del

* ..()

* Logs without user

* Webeditor 1!

* Webeditor 2: Return of Webeditor
2017-10-30 15:32:52 -04:00
ninjanomnom d8b441f543 makes greyscaled cables' color viewable in map editing 2017-10-30 03:59:28 -04:00
bgobandit 41f6a26b24 Adds force to items that really should hurt when hit by (#32200) 2017-10-30 12:49:31 +13:00
PKPenguin321 dda2e627a6 welder refuelling hotfix 2017-10-29 17:22:52 -05:00
PKPenguin321 f46f3726b4 Allows filling welders from open containers that have welding fuel in them (#32143)
🆑
tweak: You can now use beakers/cups/etc that have welding fuel in them on welders to refuel them.
/🆑

Closes #31339
2017-10-30 10:55:06 +13:00
Jordan Brown 626302c1bf Merge pull request #32161 from ninjanomnom/512-experimental
512 forward compatibility merge
2017-10-29 11:27:46 -04:00
Mercenaryblue f7455c6d97 Spooky Spectral Instruments (#31966)
* [dooting intensifies]

Spectral Instruments added
To be used with Spooky Skeletons.

* Spectral Re-balance

The spectral instruments no longer stun living creatures.
Text make you retain your loyalties now.

* Requested Changes

Added variable "too_spooky".
Defines if it will spawn a new instrument.
Re-balanced damage to 5 hits average per conversion.
Added admin notice to changelog.

* Loyalty text fix

* Spooky Trumpets

Removed comment.
Added missing spookiness.

* Spooky Dooting

Major Overhaul.

removed /brass/
Spooky Dooting is now a component.
Boneless humanoids no longer lose stamina.

* Spooky Dooting

mk2
2017-10-29 13:34:39 +01:00
kevinz000 89b7b65efe fixes stuttering being too long 2017-10-29 00:49:27 -07:00
YPO 097972ef79 Fixes cyborg upgrades not applying to held items 2017-10-28 23:10:03 -06:00
ninjanomnom 3d82455c8e fixes tags and makes garbage use \ref 2017-10-28 22:38:45 -04:00
Emmett Gaines 825ab4def4 [512] The great \ref purge (#31824)
* The great \ref purge

* cleanup
2017-10-28 17:20:04 -04:00
AnturK 83e177e43c 512 experimental (#31251)
* 512 update

* Travis update

* Fixes mass replace mixup
2017-10-28 17:20:04 -04:00
PKPenguin321 8d6bf17c6c Allows RPD to place pipes on catwalks/girders (#32141)
* Allows RPD to place pipes on catwalks

* allows girders too

* fixes parenthesis

i sniff glue
2017-10-28 10:59:12 -06:00
oranges 0fdd15de19 Merge pull request #32108 from Mark9013100/10/25/2017_cloning_book_fix
[Review Again] Updates the cloning manual
2017-10-28 11:48:14 +13:00
Jordan Brown 5dde2e3c84 Merge pull request #31864 from ninjanomnom/thermite
Makes thermite a component
2017-10-27 18:35:36 -04:00
Jordan Brown 8281df511a Removes force from slappers 2017-10-27 10:22:08 -04:00
Emmett Gaines 65606195a7 More radiation balance changes and fixes (#32051)
* more balance changes and fixes

* cleanup
2017-10-27 10:06:59 +02:00
as334 43edaedc29 Assmos part 1, #2 (#30791)
* First part of Assmos

* Adds tritium synthesis and basic in-body effects.

* Begins adding the higher tier gases. Removes Freon(not completely yet) adds new gases to scrubers. Fixes some dumb bugs.

* Whoops

* Adds effects and synthesis reactions for pluoxium and stimulum

* Kills Freon.

* Adds sprites

* Removes the magic numbers

* Hyper-Nobelium formation

* Removes Freon from maps.

* Initial Dunc Review changes

* Should ACTUALLY fix the maps this time.

* Dunc Final Review

* Debugging part 1

* Fixes brown gas synthesis

* Auto stash before merge of "assmos-pathconflicts" and "origin/master"

* fix compile errors

* Moves defines. Fixes stimulum coefficents.

* Reworks how Stim and brown gas work, adds tritium to tile fires, fixes a lot of general reaction bugs.

* fixes typo

* Hopefully fixes UI

* compiles tgui

* Tritium balance.
2017-10-26 22:11:56 -06:00
PKPenguin321 2e73703a44 Fixes rollies not being effective 2017-10-26 17:52:41 -07:00
Anonmare 07a5ef2b33 Update bed.dm 2017-10-26 22:05:33 +01:00
ninjanomnom 21d3013c2e cleanup 2017-10-26 16:15:19 -04:00
oranges 60eabd210d Merge pull request #32100 from ACCount12/gotta_earn_my_fix_points
Fixes supermatter tongs not updating icon if the sliver is dropped
2017-10-27 08:58:51 +13:00
KorPhaeron 360fbffac7 Fixes losing species preferences (#32093) 2017-10-26 18:59:57 +02:00
Mark9013100 a48fcfa28d Updates the cloning manual 2017-10-26 12:02:09 -04:00
oranges 155e7edbd8 Merge pull request #31991 from ShizCalev/reflector-stack-fix
fixes reflectors dropping extra mats
2017-10-26 23:03:21 +13:00
ninjanomnom 52d45cf0e8 makes thermite a component 2017-10-26 01:55:37 -04:00
ShizCalev fda9a345c2 Fixes defib ghost prompt (#32019)
* Fixes #32013

* proc instead.
2017-10-25 23:41:50 -05:00
Jordan Brown c54864d2ad --no-edit 2017-10-25 23:38:00 -05:00
Emmett Gaines 4cc3daa528 Greyscale cables (#31972)
* cable code is shit

* cleanup
2017-10-25 22:46:38 -04:00
Kyle Spier-Swenson 874011d3ae Fixes excessive overlay churn (#32065)
* Fixes excessive overlay chern

Adding an overlay on every cross and uncross of every player (with how bloody the station gets this is called on just about every fucking movement, some times multiple times if there are multiple types of stains (oil, blood, alien, etc) is an excessive as fuck amount of chern in the overlay subsystem.

This is likely the cause of overlays being so high.

* I APOLOGIZE FOR NOTHING!
2017-10-25 22:44:50 -04:00
ACCount12 45c8e25538 Fixes supermatter tongs not updating icon if the sliver is dropped 2017-10-25 12:08:22 +03:00
kevinz000 629662bbec Update crayons.dm (#32024) 2017-10-24 09:07:03 -04:00
duncathan salt e8c2109ea0 Atmos construction rework again (#31944)
* initial atmos construction commit ft todo list

* cleans up pipe/construction.dm

* compile

* rpd tgui

* revert rpd tgui because no icon support zzzzzz

* fixes RPD

also fixes the one RPD bug i caused the last time i touched pipe construction where you'd get null pipes if you switched from disposals to atmos pipes

* cleanup
2017-10-24 10:29:36 +13:00
Jordan Brown 94a5c1cf3b Fixes cleaning items in your hands (#31996) 2017-10-23 01:10:42 -04:00
YPOQ 3124973aa3 Fixes being unable to merge full stacks (#31992) 2017-10-23 01:08:53 -04:00
MoreRobustThanYou b12b56e421 Fixes champrojector camera bug (#31948) 2017-10-22 18:49:47 -04:00
vuonojenmustaturska 032c86435c Removes mob.lastattacked and replaces lastattacker with a string (#31981) 2017-10-22 12:28:25 -04:00
Firecage afd8bb7be5 Code Consistency: luminosity --> light_range (#31355)
* Code Consistency: luminosity --> light_range

* Finally-remembers-to-update-PR is best lizard.

* Update singularity.dm
2017-10-22 01:06:07 -04:00
ShizCalev ac60b1021e fixes reflectors dropping extra mats 2017-10-21 23:47:25 -04:00
KorPhaeron dcddc79e11 Allows species to be blocked from ever being roundstart, can now choose your Halloween species (#31877)
* Hardlocked species, halloween now lets you choose your spooky race

* Code standards, moving procs around
2017-10-20 11:10:54 -04:00
ShizCalev e865b3b8d6 Makes dust remains cleanable with acid. (#31875)
* Makes remains cleanable with acid

* I AM ALTERING THE DEAL.

* Acid act
2017-10-20 08:40:34 +02:00
oranges 193aa45bc1 Revert bluespace pipes while keeping fixes from the original PR (#31866)
These are absurdely overpowered given that they have no research or
material gate
2017-10-19 15:39:03 -06:00
vuonojenmustaturska 76af1bfe69 Stops manned turrets from firing when the user unbuckles themselves from the turret (#31754)
* The clown is drunk, and the cards of death wait on him

* Update power.dm
2017-10-19 12:41:28 +02:00
Emmett Gaines 79a39a5b9e Showers clean contamination and make sound (#31773)
* fucking showers

* cleanup
2017-10-19 10:28:21 +02:00