Commit Graph

7876 Commits

Author SHA1 Message Date
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
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
Fikou
556319be53 fixes fucky wucky 2019-08-01 10:54:24 +02:00
Twaticus
c2ce4562fc Inhand sprites for tiles #45611
About The Pull Request

Unique floor tiles now have their own unique inhand sprites. Moved floor tile inhands into their own file.
Why It's Good For The Game

Floor tiles okay.
Changelog

cl
imageadd: inhand floor tile sprites
/cl
2019-08-01 20:46:43 +12:00
RandolfTheMeh
2c3c2907de CE Blueprint Fixes (#45390)
About The Pull Request

Fixes #45341 so that blueprints can no longer be used when not in-hand, and turfs now properly compile a list of the blueprint items it should hold by delaying when it retrieves this information, as objects such as manifolds and wires didn't initialize with their proper sprite.
Changelog

cl
fix: The CE's blueprints can no longer be used if not in-hand, and its scanning function has been fixed.
/cl
2019-08-01 10:24:20 +12:00
Rob Bailey
6a26744d83 Clothing /under repath (#45548)
About The Pull Request

repaths clothing/under to be more sane
Also fixed a couple of bugs relating to pathing being incorrect, and modified a couple of bad descriptions and names
Also adds a map path updating script, which also helps show the full repath.
Why It's Good For The Game

improves maintainability, makes mapping easier, stages for a clothing dmi split
Changelog

cl
refactor: repathed all under clothing, keep an eye out for errors
/cl
2019-07-30 19:20:21 +12:00
Rob Bailey
fcb98515e6 Merge pull request #45534 from nemvar/istype(src)
Removes some istype(src) stuff
2019-07-29 18:55:21 -07:00
Rob Bailey
e9b6356241 Merge pull request #45540 from blessedmulligan/telewelder
Welders only blind the user if they're close
2019-07-29 18:53:54 -07:00
tralezab
e94b6139cf Fixes some issues with balloons (#45554)
* Ok, this was just embarrassing

* uno

* dos

* tres

* cuatro

* wait, these vending machines are crazy similar...?
2019-07-29 18:51:41 -07:00
spookydonut
88eca69eb5 converts some spawns into timers (#45429)
* converts spawns into timers

* linter

* change per review
2019-07-29 02:23:15 -07:00
RandolfTheMeh
48fbc073e5 [TMC] Defib Rework, Organ Damage Effects (#45104)
* Brain damage works on organ damage procs, some defib reworks

* Heart and Lung damaging effects and failure, liver damage and failure moved to its organ again

* Cleans up reused global

* Organ damage procs on living and living/carbon

* Changes brain damage procs again

* SR heals all organs on revive, no decay for cybernetic implants, stomach damage and fail effects.

* Damage and failure effects for the appendix, ears, and some touchups on the stomach

* Committing changes so I don't lose them

* Organs now cease decaying in the proper containers

* Organ Fridges

* Reverts map changes

* Adds coronary bypass, lobectomy, trying to deal with organ_stat runtime

* Actually fixes merge conflict

* Smartfridge tweaks

* Think I figured out map merger

* Evidently not

* Still runtiming with glass shards even after I remove the map changes?

* Fixes runtime error with brain_item

* Runtime fix on living/carbon/life

* Cleaning up old PR code

* Brain damage fix, moves defines to actually be in _DEFINES, under DNA since that's where organ slots were

* Wrong math operation used

* Brains in MMIs no longer decay

* Removes redundant variable, and defibs no longer work on heart attacks caused by failing hearts

* Removes misleading comment

* init freezes organs in case organ crates are added, morgue corpses are frozen, removes adjustLiverLoss

* Removes random spaces, scanners check brain damage severity now

* Swaps numbers for defines, fixes brain surgery, rebalances coronary bypass bleed since that was insane last I tested it

* List change

* Runs off of an index instead of using cut

* Brains can be put into organ fridges

* Fixes minor type, hotfix for cloning problem

* Removes pointless check

* Demon hearts no longer decay

* Nightmare hearts no longer decay

* Removes istype() check on process, sets can_decompose instead

* Condenses organ damage report

* Removes organ failure messages

* Less organ damage spam, implements organ threshold messages instead

* Brain damage messages go to owner, not source

* Self-examine shows damaged organs

* Minor code cleanup, adds autodoc comments to the new procs

* Inverts standard organ vars to prevent random organs decaying, adds a few more autodoc comments.

* Merged the booleans into a set of flags

* Healthy living improves organ healing rates

* dunno why this didn't update

* my actions have consequences

* Sets ORGAN_SYNTHETIC for overlooked robotics organs

* Doubles heart decay time

* 3 minute heart decay

* Lobectomy/Coronary_Bypass heal more

* removes hivemind spells from the changes
2019-07-29 02:18:22 -07:00
Dennok
48258b68c9 Spending of tank don't change distribute_pressure. (#45434)
Tank still give max of available pressure.
2019-07-28 18:01:57 -07:00
Garen Crownguard
58b5819be0 Fixes infinite loop when you catch a cult bola (#45492) 2019-07-28 17:58:35 -07:00
nemvar
877cfc7b21 Fixes crab 17 qdel problem. (#45523)
* QDEL_IN

* No longer keeps racking up timers.

* Moves it to init, because why not?
2019-07-28 17:22:51 -07:00
nemvar
dabbd79ca9 Filthy override 2019-07-28 18:46:05 +02:00
blessedmulligan
36da801edd welders no longer flash the user if the user somehow manages to not be adjacent to the welder 2019-07-27 21:43:09 -05:00
nemvar
f7c9751d69 Removes some istype(src) stuff 2019-07-27 22:55:49 +02:00
py01
d96ff5beff Flashbangs auto-stun in radius 1 (#45381)
* flashbangs stun in radius 1

* changes flashbang rad 1 effect
2019-07-27 04:41:04 -07:00
nemvar
26eea3c056 Extremely critical documentation. (#45504) 2019-07-27 02:39:02 -07:00
Tad Hardesty
9db90154a0 Fix some circuit board examines (#45488) 2019-07-27 02:35:43 -07:00
spookydonut
18558f4ae4 Fixes #44694 (#45472) 2019-07-27 02:34:54 -07:00
Dennok
97328e9ab3 RCD update (#45357)
Add simple circuits to rcd
2019-07-27 02:11:23 -07:00
nemvar
449e5d38e6 This turns butchering into something that resembles a component. (#45299)
* This turns butchering into something that resembles a component.

* Changes how the recycler works.
It no longer uses butchering in disgusting ways.

* I guess this works? It's not pretty though.

* How the fuck...
2019-07-26 23:57:37 -07:00
skoglol
718973fb9f Removes the assimilation/hivemind gamemode (#45316)
* Initial pass

* comment.

* stray ,

* stray define begone
2019-07-27 00:08:53 +02:00
tralezab
64550884fa [READY] Ian's Birthday Holiday (#45356)
* ian's birthday

* missing )

* hop shirt + bday cake is on front desk

* confetti 1/2

* confetti 2/2

* corgi balloon, hop gets a knife to cut the cake

* forgot knife + inhands + mapping

* oranges review, old var removed

* oranges request ;)
2019-07-25 23:23:53 -07:00
FantasticFwoosh
c85080e490 Fixes fake basalt tiles costings (#45445)
Stack recipie now relies upon 'glass ores' to craft, which when the tile is dug returns 2 sand, the same amount to craft one fake volcanic tile, ending the exploit.
2019-07-25 23:12:40 -07:00