Commit Graph

7900 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
81Denton 7b8579c17a Minor ghost notify changes (#45759) 2019-08-08 01:47:04 -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
Michael Ashfield 8e3ace7e6f Plasmamen get plasma in their box (#45538)
* rebase branch

* Revert "rebase branch"

This reverts commit 72e70fe8ccabfa6c750193a57beeec14b30a2533.

* Updated this old code to fork

* gives the clown hugbox

* Clown gets hugbox back

* Removed new boxes, changed box code

* Sorted line spaces

* Removed sauce
2019-08-06 15:13:19 -04:00
kingofkosmos c3ea51908d Adds "you" to local visible_messages (#45631)
* adds "you" to some combat visible_messages.

* more you-messages and attack verbs to present tense.

* small fixes

* more additions and small fixes

* few message tweaks

* Fixes a typo and few other wordings.
2019-08-06 02:15:34 -07:00
nemvar 4d5fb1a578 Adds a GPS component. (#45660)
* Adds a GPS component. Megafauna no longer needs gps implants.

* Removes commented out code.

* Removes the last internal radio

* I was already wondering why the diff was so small
2019-08-05 19:13:19 -07:00
Rob Bailey 0c6fabceb0 Merge pull request #45680 from 81Denton/unfuck_c4
Refactors C4/X4
2019-08-05 19:09:57 -07:00
nemvar ccbb0a91d7 Cleans up some martial art code. (#45502)
* Removes/Moves some weirdly placed variables in martial arts. Splits NO_GUNS and CHUNCKY_FINGERS traits.

* Maybe this should actually compile

* c begone
2019-08-05 16:58:12 -07:00
Rob Bailey 2c720c6408 No ID insertion for everything except the hop console (fixes the ORM) (#45693)
About The Pull Request

machines and consoles that previously required an inserted ID now check access on worn and inhand ids. They otherwise function identically.
Affected things:
ORM: click claim to claim cash to connected ID (also fixes it)
Mining vendor: uses ID on person or in hand.
medical console: checks worn ID
security records console: checks worn ID
gulag consoles: claim points to worn ID, checks access and point requirements from worn ID

Also some backend refactoring to prisoner management and gulag teleporter consoles

hop console will be next to strip out the shitcode entirely but this at least gets things functional in the mean time, but fully tested this time. It's very late here and I need to sleep. Due to the nature of it it's more elaborate of a rework.
Changelog

cl
tweak: Medical and Security consoles now check access on worn or inhand ID instead of requiring an inserted ID
tweak: mining vendor now reads from ID in hand or on person instead of requiring an inserted ID
fix: ORM is functional again (for real this time)
tweak: ORM claim points button transfers points to worn/inhand ID instead of to an inserted ID, no longer accepts insertions
tweak: Same for gulag consoles
/cl
2019-08-04 22:53:55 +12:00
Dennok d464a7c689 add flag CHANGETURF_INHERIT_AIR 2019-08-04 12:54:12 +03:00
nemvar e587b970da Adds parent calls to almost all tool_acts (#45582)
* Adds parent calls to almost all tool_acts

* actually compiles
2019-08-03 22:25:57 -07:00
Tad Hardesty f1f9d604dc Remove atom creation in vending machine icon generation 2019-08-03 13:30:38 -07:00
Denton ea787b243d h 2019-08-02 23:00:39 +02:00
Denton 154874d435 h 2019-08-02 22:44:59 +02:00
Denton d98df6e063 Refactors plastic explosives
y
2019-08-02 22:31:05 +02:00