Commit Graph

12326 Commits

Author SHA1 Message Date
nemvar 6d7bccfca4 Jackhammer nerfs. This thing no longer destroys wall instantly. (#46019) 2019-08-23 16:45:31 -07:00
Fikou d02fd12629 adds the ancient spear as a null rod option (#46048)
* adds the ancient spear

* clocked

* switcheroo
2019-08-23 16:38:21 -07:00
carlarctg bda590ec9f improvements! (#46075) 2019-08-23 16:34:41 -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 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
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
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
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
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
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
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
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
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
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
carlarctg 15717dda7a Gives borg tools unused sprites (#45939)
* where's the get good button

>adds some borgtools
>fills empty tool pixels with 254 transparency pixels

* tool stuff

* fixes icon

* repoked

* cobbdescus part 123/X: cobbtool cobbmove cobbreview
2019-08-17 23:48:26 -07:00
tralezab 8b190dbc27 fixes golems not getting antag and other things when switching shells (#45941)
fixes golems not getting antag and other things when switching shells
2019-08-17 23:41:33 -07:00
nemvar a40ee7d303 Changes hulk code. (#45866) 2019-08-17 00:55:27 -07:00
Rob Bailey 419bffc8b8 Merge pull request #45937 from tralezab/patch-63
adds a headgear check to crayons
2019-08-17 00:36:51 -07:00
tralezab 4fa0d761a8 song for this fix: Enigma - Modern Crusaders (#45936) 2019-08-16 21:12:21 +02:00
nemvar 8918a88612 Makes organ decay a lot nicer. (#45845)
* Gets rid of double processing memes.

* fixes the organ box thing

* Makes everything just a tad more performant

* even more performant

* Gets rid of the double processing on SSobj for body eggs

* forgot the brackets

* Also removes double processing memes from the shadowling armblade

* Removes the istype check for MMIs.
2019-08-15 21:52:07 -07:00
tralezab e9988dffba whoops 2019-08-15 12:33:29 -07:00
tralezab 81529e49fe song for this fix: Seiko Matsuda - Aoi Sangoshou 2019-08-15 12:30:13 -07:00
Akrilla 809be06373 [TMC] Baton rework (#45377)
* stun

* stamina tweak

* 5 units

* 2 hits even with chem

* Update stunbaton.dm

* This is a good slowdown

* new chem + confusion

* overdose

* h

* update

Co-Authored-By: JJRcop <jrubcop@gmail.com>

* less cheap

* better overdosing

* typo

* *=

* confused

* overdose tweaks

* tweak

* no var

* typo

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* *

* tweaks

* stamina batons

* knockdown

* Update code/game/objects/items/melee/misc.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* number tweaks

* maint

* 2

* cooldown and less stuntime

* tweaks

* conflict

* text
2019-08-14 14:59:46 -04:00
81Denton 1c4036b309 [TMC] Explosion rebalancing (#45819)
* megumin is best girl fucking fight me

* what kind of smoothbrain capizalized these

* uses explosion defines

* more explosion defines

* Removes reagent explosion code for <1 amounts

* Scales explosion knockdown off bomb_armor
2019-08-14 10:55:50 -04:00
Rob Bailey b25d3efda2 correct black suit (#45876)
* correct black suit

* two piece in wardrobe
2019-08-13 17:17:55 -07:00
Dennok 4e6d8c073a Silo link RCD upgrade (#45607)
* Update all_nodes.dm

* Update RCD.dm

* Update RCD.dm

* Update construction.dm

* Update tool_designs.dm

* Update RCD.dm

* Update RCD.dm

* Update RCD.dm

* fix mat container

* up

* add radial silo link button

remove silo link verb
2019-08-13 16:59:03 -04:00
bgobandit ee0d68aeca Clicking a display case on help intent examines it. (#45842) 2019-08-13 16:48:03 -04:00
Rob Bailey 4b17e5297f Reinforced window construction fixes (#45890)
About The Pull Request

Fixes a couple of issues related to window construction introduced by the tougher windows PR.
Also gives plastitanium and shuttle windows matching values to reinforced and plasmawindows like I intended to on the last PR.
Why It's Good For The Game

fix
Changelog

cl
fix: newly constructed reinforced windows start in the correct state, meaning they can be disassembled
fix: crowbar can no longer be used out of order on construction
fix: screwed down but not levered in windows can be unscrewed again
tweak: shuttle and plastitanium windows now have the proper values to match reinforced windows.
/cl
2019-08-13 17:19:26 +12:00
81Denton 24b21c19e2 Laserpointer scaling fix (#45860)
h
2019-08-12 20:29:42 -07:00
Jeremiah Cooley 2f555244bb Close quarantine module loophole (#45766)
* Quarantine module now has teeth

* Quarantine applies to everyone

* typofix and more genericness

* Legal clarification

* Rules lawyering

* Rule 1 friendlier version
2019-08-12 10:47:16 -04:00
tralezab b5de31638d You can no longer name some things after words in the ic filter (#45696)
* quick sanity fix

* more things i found

* better list used, updated comment
2019-08-11 18:33:39 -04:00
James be3000d8ca All windows now have consistant spans (#45809)
* R-Windows now have consistant examine messages

* I forgot plasma windows too
2019-08-10 02:25:07 -07:00
Akrilla 9ca37e9169 Contract rerolls and general enhancements (#45703)
* refactor wip

* rerolling and qol

* space not valid

* travis be nice

* comment?

* new tablet sprites

* Start on uplink screen

* new suit sprite

* paper

* merge conflict

* Auto stash before merge of "contract-reroll" and "tgstation/master"
2019-08-10 02:11:11 -07:00
Mickyan 1c520ee04f range (#45774) 2019-08-09 15:06:50 -07:00
nemvar 7f75d2c351 Fixes defib paddles (#45797)
* Fixes defib paddles

* Wow weee

* Adds some qdel stuff
2019-08-09 12:13:02 -04:00
nemvar 02251be5ac Turns Gibberish code into something that's not gibberish (#45753) 2019-08-09 11:32:32 +12:00
oranges 8c8e618804 Merge pull request #45694 from AutomaticFrenzy/patch/fix-stupid
Remove atom creation in vending machine icon generation
2019-08-09 11:11:24 +12:00
Twaticus 9dfa78cb47 Underwear color (#45630)
About The Pull Request

    Changes our current underwear selection to greyscale so you can color them any way you like, just like hair.

    Removed duplicate underwear types that only served as a few color options(female_yellow, male_blue, ect.) Underwear with designs are unaffected(female_uk, male_commie, ect.)

    Added a new option in dressers to change underwear color.

    Changed some underwear names to fit the new option(female_red is now female_lace, ect.)

A9hAqkxgin
If all is well i plan on adding this to undershirts and socks too.

also HUGE thank you to nonfictiongames for the help!!!!
Why It's Good For The Game

More character customization in roleplaying game GOOD
Changelog

cl
add: Underwear can now have any color. (Your character will most likely be nude now so check your prefs!!)
add: Underwear color option in dressers
tweak: changed some underwear names
imagedel: deleted duplicate underwear

/cl
2019-08-09 11:04:58 +12:00
Rob Bailey a5de1c1b5e [READY] Reinforced windows are harder to get through (#45609)
About The Pull Request

full tile Reinforced windows now require a melee item over 11 damage to damage, have 150 health, and 90 melee armor. This is approximately 2 minutes of sustained beating with a toolbox.
full tile reinforced Plasmaglass windows now require a melee item over 21 damage to damage, have 200 health, and 95 melee resistance. This is approximately 3 minutes of sustained beating with a toolbox.
dir windows have been given the appropriate halved health values.

Current deconstruction steps:

    heat one way screws (welder, 18 seconds, harm intent required)
    unscrew one way screws (screwdriver, 8 seconds)
    pop out panel (crowbar, 5 seconds)
    cut connecting bars (wirecutter, 3 seconds)
    unbolt frame (wrench, 5 seconds)
    theoretical fastest time: 39 seconds
    more practical time: 45 seconds

if the bolts are heated and then not unscrewed within 30 seconds they cool off again, and must be heated again

Construction is the same as before except the crowbar levering step takes 10 seconds instead of 3.
Why It's Good For The Game

Getting into places you shouldn't be is currently way too easy.
This change forces you to hack in, disassemble the window, or target a weak point like a windoor.
At the moment, it is possible to smash down what is intended to be a secure window with an item you get in your bag at roundstart for free. This is stupid. It should require some planning or at least thinking to be able to make your way in places you should not be.

Oranges has talked in the past about departments being designed like impenetrable fortresses with shutters everywhere, and this happens because reinforced windows are far too weak and unreliable to be able to have as effective defense of any department against even underequipped and underprepared people. This leads to the introduction of shutters which are too strong and difficult to deal with in most cases.

This is part of some plans to make departments more secure overall while still providing ample avenues for determined or properly prepared individuals able to get in if they want to. Despite having more plans along with this, this is a standalone change as is. This is not a "this will only work with later changes I'm totally going to do" situation
Changelog

cl
balance: Reinforced windows now require a melee item over 11 damage to damage, have 150 health, and 90 melee armor. This is approximately 2 minutes of sustained beating with a toolbox.
balance: Plasmaglass windows now require a melee item over 21 damage to damage, have 200 health, and 90 melee resistance. This is approximately 3 minutes of sustained beating with a toolbox.
/cl
2019-08-09 11:03:59 +12:00
Akrilla c9c57c4419 Small cigarette refactor and Syndie cigs more viable for healing (#45711)
* cig

* price

* back to 2

* smoke all
2019-08-08 02:10:53 -07:00
William Wallace 153e0d0250 Footprints no longer always face south and can rotate properly (#45752)
* footprints no longer always show south-entering prints

* footprints can be rotated without breaking

* return consistency
2019-08-08 01:48:24 -07:00
81Denton 7b8579c17a Minor ghost notify changes (#45759) 2019-08-08 01:47:04 -07:00
Arkatos1 c638de2370 Init fixes (#45762) 2019-08-08 01:07:33 -07:00
nemvar b9fa7963a7 Moves the C4 overlay to the float layer for mobs. (#45754)
* Fixes C4 stuff

* Only does it on mobs.
2019-08-08 01:02:57 -07:00
nemvar 269c7666fc Nerfs reinforced bolas (#45622) 2019-08-07 16:00:34 -04:00