Commit Graph

48181 Commits

Author SHA1 Message Date
Rob Bailey d18925fb41 Merge pull request #46084 from AnturK/runtime_β
Fixes boh dumping runtime
2019-08-23 16:31:24 -07:00
Rob Bailey 409f737e31 Fixes orm runtime. (#46083)
* Fixes orm runtime.

* sure
2019-08-23 16:30:49 -07:00
nemvar 66f17ecd57 Fixes thermite on reinforced walls. (#46089) 2019-08-23 16:30:26 -07:00
ATH1909 5afc95aa62 How can you kill a god? (now separate from my alkali explosion PR) (#46062)
About The Pull Request

This PR adds a Morrowind reference to "divine" plushies (the Nar-Sie and Ratvar plushies).
Why It's Good For The Game

It's a funny (I hope) joke.
Changelog

cl ATHATH
add: Adds a Morrowind reference that occurs if you try to kill a divine plushie.
/cl
2019-08-24 10:54:41 +12:00
moo c83bf10544 Update cat2_medicine_reagents.dm (#46105)
Hotfixed to the Not-So-Test Merged C2 Chems
2019-08-23 14:31:18 -07:00
AnturK d1267a142a sure 2019-08-23 21:22:24 +02:00
moo 7437be0a9a Cobbduceus Part 2/X: Medibot-chan Tends Your Wounds (#45953)
* meow

* fix var

* cursed

* Revert "cursed"

This reverts commit 249491cfc1c05e21f9650a2d8c109c13741067f5.

* simple anti-multibot
2019-08-23 04:16:34 -07:00
cacogen 99f88c9d32 Canned foods behave more like canned drinks and less like fruit (#46013)
* Canned foods behave more like canned drinks

Have to be opened first, leave an empty can when finished. Don't say they've been bitten when examined.

* Fixes broken paths in maps

* Implements tralezab's feedback

Co-Authored-By: tralezab <40974010+tralezab@users.noreply.github.com>

* Adds Kryson's unused can state sprites
2019-08-23 01:40:47 -07:00
moo 74ed605cd7 Cobbduceus Part 1/X: Category Twos, Base(d) Healers (#45749)
* 150 hours

* it compiles guys

* PERF

* meta conflictor

* oldcabin

* Revert "meta conflictor"

This reverts commit 812343ca615e5b00711786be4413ce3301cfcc90.

* oldmeta

* TAKE 5000

* NAME THIS

Also redoes Multiver/Palletta

* FRICK U FIZ

* NERF PERF

* comment cringe

* Checks for restraints/incapacitated for ichiyuri

* URIKA

Removes Healing-Scaling of Ichiyuri, Nerfs Healing of Aiuri.

* organ

* please upvote this

* maps...

* Gives Instabitaluri a Brand Name

Oh wow it's synthflesh 😆

* Update cat2_medicine_reagents.dm

* what kinda characters is Krys using
2019-08-22 17:30:16 -07:00
Rob Bailey 45978a1abe helmet to armor more standard (#46060) 2019-08-22 17:28:47 -07:00
nemvar 106c0b97fc Fixes weird characters. (#46047) 2019-08-22 17:27:32 -07:00
carlarctg 189964ef26 Powersink now wrenchs into the grid instead of being screwdrivered into it. (#46038)
* wrench

* PR creep
2019-08-22 17:27:11 -07:00
81Denton f0c2a4ea53 this PR was pushed from disney(tm) world(tm) (#46050) 2019-08-22 17:25:50 -07:00
AnturK a6232420de Fixes boh dumping runtime 2019-08-22 14:12:04 +02:00
AnturK 64992c69d1 Fixes orm runtime. 2019-08-22 14:09:17 +02:00
skoglol 8e6276d450 Adds UI dimension vars to machinery (#45959)
* Adds dimension var to machinery.

* cleaner

* newlines

* Cleanup
2019-08-22 00:33:10 -07:00
carlarctg 8f34bf11aa Adds inhand improvised shotgun sprites (#45995)
* the poke

* e

* wrong bracnch

* improvised spripes

* better spropes

* hoook time

* hooky

* h

* fuckkkk

* "fix"

* fuggggggggggggggg

* shit wrong pr

* fixes

* no e

* un-hooked

* more unhookinga

* added unused twohanded sprites

* Revert "Merge branch 'master' into shotgun"

This reverts commit 95caaf6270cebdc21b80659a6a0725bf37c005d1, reversing
changes made to 3cec8e8f3b188a15a495adb61f724cedd7d35246.

* Revert "Revert "Merge branch 'master' into shotgun""

This reverts commit 6677b4718f22f99befe4e9718b9b7c1f02ea6311.

* Revert "Revert "Revert "Merge branch 'master' into shotgun"""

This reverts commit 3df1e045861bb3abcebaa5b900648b016c53d620.

* Revert "Revert "Revert "Revert "Merge branch 'master' into shotgun""""

This reverts commit 8fc15d61daf40dd2ae557fdefdbd73274540cf01.

* big brain move ahead

* big brain move actuated
2019-08-22 00:23:55 -07:00
Iain Price a86c9e976f Fix placement issue with APC frames (#46023)
Placing an APC on a wall currently evaluates the area that the wall is in ; as walls often border two areas this may not be the area the user expects.  Instead if we evaluate the area of the user we'll be "inside" the target area.

Fixes surpious and inexplicable "This area already has an APC!" errors.

The fact that diagonal placement of frames is prohibited is assumed in this fix.
2019-08-21 23:58:36 -07:00
nemvar 6bf68ecc65 Roundstart borg brains no longer decay. (#46042)
* Fixes that roundstart borg issue.

* The other fix.
2019-08-21 23:58:05 -07:00
Mithrandalf 37a27c3240 removes digi variation from cargo jumpskirt (#46043)
Fixes https://github.com/tgstation/tgstation/issues/45972
2019-08-21 23:57:46 -07:00
Redmoogle 7f327357b4 Fixes incorrect code in the SM (#46040)
* Update rped.dm

* Revert "Update rped.dm"

* fixes oversights

* oops
2019-08-21 23:57:00 -07:00
nemvar 1d866977ba Changes thermite (#46020)
* Nerfs thermite

* Adjusts those numbers.

* Reinforced walls now need 50 units.
2019-08-21 10:19:02 -04:00
Fikou fd77afa43c helmet to armor more standard 2019-08-21 13:37:59 +02:00
cacogen 334e4d5eaa Can swap out seeds and disks in the plant DNA manipulator with a click (#45975)
Either click the machine itself or the UI fields when it already has seeds or a disk in it
2019-08-21 01:43:31 -07:00
Rob Bailey 1c0a72383c Merge pull request #45993 from cacogen/idconsoletweaks
ID console tweaks
2019-08-21 01:41:08 -07:00
Rob Bailey 024932eaee Merge pull request #46008 from nicbn/quiet-quiet-now-you-are-on-the-doorstep
Walking now makes no footstep sound, and xeno footsteps are louder
2019-08-21 01:17:52 -07:00
Rob Bailey cef3379b5b obese now checks fat is caused by itself (#45992) 2019-08-21 01:09:17 -07:00
nemvar 1ec07b1508 Fixes that pesky dumping issue (#46025) 2019-08-21 01:08:36 -07:00
nemvar e3b6671d04 sss (#46022) 2019-08-21 01:06:42 -07:00
nemvar aa16abee4e Reinforced walls now get pulled correctly by singularities (#46024)
* Fixes reinforced wall runtime. They actually protect against singulos up to tier 5 now.

* Fixes reinforced wall runtime
2019-08-21 01:04:47 -07:00
nemvar c5f3ed3ca0 Fixes old pictures (#46017)
* Old pictures now have the correct icon.

* didn't mean to put this here.
2019-08-21 00:51:26 -07:00
cacogen b32aad7ef6 HoP console changes 2019-08-21 17:13:05 +12:00
PKPenguin321 898f544414 [Ready] Adds a Shrink Ray (#45387)
About The Pull Request

    It adds a shrink ray that has 5 shots, can be recharged, has unique (coder)sprites, and has a cool sound
    Shoot a thing with the shrink ray to make it small. Anything can be shrunk except floors
    Shrunken things grow back after a couple seconds, might adjust this
    Small things will not block vision and can be walked over (this includes walls)
    Small people won't fit into their clothes and will drop all their stuff (or rather, their stuff will drop off of them). They also can't move very fast, and take 2x damage while shrunk.
    Preview video here

Why It's Good For The Game

It's really goddamn cool
Changelog

cl PKPenguin321, Fury McFlurry
add: A shrink ray for abductors that they can buy at their console for 2 experiment points. Anything can be shrunken, and shrunken things can be walked over/seen past (for example, you can shrink a wall and then walk around it). If a human is shrunk, they will drop all of their belongings, move slower, and take 2x damage.
imageadd: Shrink ray sprites by Fury McFlurry. Thank you!
/cl

I intend to add it as a thing abductors can purchase but am putting it up now for code review and if anybody has any other ideas on good thematically fitting places to put it.
2019-08-21 11:50:38 +12:00
oranges 968e90ba35 Merge pull request #45929 from tralezab/imgur.com/a/t97VXU7
New VV dropdown for adding components and elements to something
2019-08-21 11:45:14 +12:00
kevinz000 dcf1b572cf Adds support for admin-bused pneumatic cannons that fire non /items again (#45957)
About The Pull Request

Adds an isitem check so load_item doesn't runtime when it adds a non /item into the cannon which admins can trigger using fill_with_type
Why It's Good For The Game

It probably isn't but let's pretend it lets us do something fun other than making a singularity cannon.
Changelog

cl
tweak: Pneumatic cannons can be used with non /items again.
/cl
2019-08-21 11:39:34 +12:00
nemvar fd214c52a4 Turns mob biotypes into flags instead of lists. (#45905)
About The Pull Request

title.

Also renames INORGANIC to MINERAL and removes it from simplemobs (never used for simplemobs) where it doesn't fit. Doesn't make sense to have both ORGANIC and INORGANIC as a flag.
Why It's Good For The Game

There's no reason to use a list for this.
Changelog

cl
code: Changed mob biotypes from lists to flags.
/cl
2019-08-21 11:28:30 +12:00
Akrilla c5b11dc283 Adds cancel buttons to inputs (#45825)
About The Pull Request

Adds cancel buttons to input boxes that didn't have them before.
Why It's Good For The Game

Good UX.
Changelog

cl
add: More cancel buttons.
/cl
2019-08-21 11:25:41 +12:00
Akrilla ab4011146f Leaving agent card forge name blank randomizes it (#45805)
About The Pull Request

Leaving the forge name text field blank, or it being invalid for another reason, will randomize it.
Why It's Good For The Game

Leave blank to stop the 30 second thinking about what realistic name to give yourself. QoL change.
Changelog

cl
add: Agents cards randomly assign you a name if you leave the name field blank.
/cl
2019-08-21 11:25:20 +12:00
ShizCalev c2200cd1da Cleans up card generation a little (#45784)
Just condensing some code down, nothing really to note.
2019-08-21 11:24:46 +12:00
oranges 57266c7d35 Merge pull request #45701 from Dennok/ChangeTurf-calls-add-keep-air
Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls.
2019-08-21 11:23:11 +12:00
TheChosenEvilOne 5252273595 Fixed multiple issues with dynamic. (#46027)
About The Pull Request

Fixed multiple issues with dynamic and removed the delayed roundstart ruleset code.
Why It's Good For The Game

Fixes and stuff
Changelog

cl
fix: Midround rulesets can again be executed.
fix: Revolution ruleset has been fixed.
code: Replaced the delayed ruleset type with a delay var.
/cl
2019-08-21 11:05:01 +12:00
tralezab a9a3682ef3 amazing (#46034) 2019-08-20 16:45:41 -04:00
Krysonism b3399ffe39 [READY FOR REVIEW]Da botany update: Four new plants and plant traits + trait immutability (#45840)
* bungo

* Adds galaxy thistle and spaceman's trumpet.

* Traits update + new mushroom.

Adds new traits and mutability variable.

* Fixes bungo pit contents

* Bungotoxin lethality is now more in line with other good toxins.

* Adds hair dyeing functionality + lowers enzyme

* flags, plant stat adjustments, runtime fix, spelling and mutations.

* Nerfs toxin content of bungo pits to reduce hypodermic induced lethality

* Name getter fix, adds rarity, better documentation, carnivory tweak

* Bungotoxin has more tells.

* fixies
2019-08-20 16:00:52 -04:00
tralezab e2ddf27890 TralezaboOoOoo Part 1/1: Paranormal Mulebot-chan Carries Your Ghosts (#45958)
* song for this fix: Streets of Rogue OST - Hit Me With Your Best Rock

* muahahaha

* what the fuck

* linter be happy

* visible G-G-G-GHOSTS

* okay, ACTUAL visuals for ghosts + youtube video soon

* NEW FREAKING SPRITES THAT WILL BLOW YOUR SOCKS OFF

* boom... it now will actually have the name it was given

* first off, the name
2019-08-20 09:48:34 -04:00
nemvar d93f31f388 Removes airlock charges. (#45989)
* Removes airlock charges.

* stuff for the bundle

* formatting fix.

* Adds the sabotage bag
2019-08-20 09:47:06 -04:00
Rob Bailey 43400f3c67 Cleans up the new alt clicking functionality (#45769)
* deshitcodify

* durr

* checks if eject/insert succeeded
2019-08-20 09:29:47 +02:00
ATH1909 134094de67 Adds a Minecraft reference to eggs (#45912)
* Update heal.dm

* Update heal.dm

* Update snacks_egg.dm

* Update snacks_egg.dm
2019-08-19 22:57:17 -07:00
MMMiracles 5bf2bafdd8 Adds Capitalism Firing Pins (#45893)
* adds capitalism firing pin for late-stage capitalism

* purchase prompt so you can't bankrupt the captain with a rigged gun

* prompt spam check, cargo crates for pins, extra warning message for accepting payment but not having enough to pay out

* test stuff please ignore

* pay-per-shot system, alert instead of input, minor cleanup

* fuck off clown

* range check to prevent long-range purchasing
2019-08-19 22:56:06 -07:00
Dawson1917 cb91b9954f Adds Fix Air verb for admins (#45916) 2019-08-19 22:52:49 -07:00
itsadavid 3c3361d59e tweaks armor values on crab-17 (#45798)
* tweaks integrity and armor values on crab-17

* feedback
2019-08-19 20:15:33 -04:00