Commit Graph

47903 Commits

Author SHA1 Message Date
Denton
cef6714202 Moves welding goggles to protolathes 2019-07-30 17:53:45 +02:00
oranges
cf29117c82 Merge pull request #45402 from actioninja/shieldgenruntimefix
Fixes a shield gen runtime
2019-07-30 21:09:28 +12:00
moo
7c551c7e85 Tend Wounds Now Is -2 Steps and Borg-Friendly! (#45457)
cl Cobby
balance: Tend Wounds is -2 Steps (Scalpel > Healing w Hemo > Cautery)
fix: Borgs can now perform Tend Wounds
add: Anti-spam on Tend Wounds (Starting Message only, Result Message untouched)
admin: The incise step for Tend Wounds does not cause damage, making it borg friendly.
/cl
Why

Tend wounds should be the baseline so let's make it easy to perform.
2019-07-30 20:53:50 +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
1a24447a82 forced doesn't trigger spam detection (#45571)
* eminence

* imaginary friend

* blob overmind

* say
2019-07-30 19:08:08 +12:00
Rob Bailey
5e906034ff Merge pull request #45535 from nemvar/fixesmoodforreal
Fixes mood for real
2019-07-29 19:45:07 -07: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
Rob Bailey
2622bdd56c Merge pull request #45530 from bgobandit/thishasbuggedmesincelike2013goodgod
Clicking the cloning pod examinates it.
2019-07-29 18:53:36 -07:00
Rob Bailey
803f0fc894 Merge pull request #45558 from nemvar/butcheringfixes
Fixes some issues with the butchering refactor
2019-07-29 18:52:41 -07:00
Rob Bailey
1173c2c468 Fixes welding goggles design (#45556)
* Fixes this stupidity

* compilegood
2019-07-29 18:51:58 -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
AnturK
714c61c70f Adds way to add/remove traits for admins (#45503) 2019-07-29 02:21:22 -07:00
Toast
664e002bf1 Joker Upgrade Retuned (#45386) 2019-07-29 02:20: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
xmikey555
80df08aefd Fixes 357 autolathe shells, also fixes the custom incapacitating shot (#45527)
* fixes materials for 357 casing

* also fixing incapacitating shot
2019-07-28 17:57:37 -07:00
bgobandit
a0a7d0ff33 Disguised syndicate saboteur cyborgs now use the regular cyborg bubble_icon. (#45515) 2019-07-28 17:56:28 -07:00
Tlaltecuhtli
80f593dda6 puts message spam from not having keys on a vehicle on cooldown (#45507)
* Update maps.txt

* Update ridden.dm
2019-07-28 17:23:47 -07:00
nemvar
3526418a00 Fixes the ORM. (#45522) 2019-07-28 17:23:27 -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
kingofkosmos
f887a0b114 Console alt-clicking tweaks (#45193)
* * reworked consoles so you can:
 * use attackby to insert id
 * use alt-click to eject id
 * examine to see if alt-click is available
 * moved eject_id and insert_id procs to _computer.dm
 * added some sound effects

* * prisoner management console new features: insert id with attackby and eject with altclick

* * prisoner management console can't have multiple prisoner id's inserted

* removed unnecessary src. and changed usr --> user

* made gulag teleporter consistent with attackby, altclick and examine.
simplified attackby on card.dm

* equipment reclaimer station consistent with id attackby, altclick-eject and examine.
point claim console consistent with id attackby, altclick-eject and examine.

* ore redemption machine and mining equipment vendor made consistent with id attackby, altclick-eject and examine.

* * reworked all eject/insert ID copypastacodes into procs in _machinery.dm

* * 0's to FALSE

* hopefully i didnt mess up any more things in the resolve

* everything now uses id_insert-proc and doesn't work.

* compiles but doesn't work

* works
2019-07-28 16:25:36 -07:00
Kyle Spier-Swenson
0fa87b7bbd [s]Throttle mind notes (memories) (#45555)
* Throttle mind notes (memories)

Some dipshit is spamming this on ss13 servers

Limits to 100 times the message limit (removing old text after that), and one call every 5 game seconds.

* Throttle at the right place

* Not here

* We really need a generic throttler solution
2019-07-29 09:09:33 +12:00
nemvar
6755ba7488 Fixes some issues with the butchering refactor 2019-07-28 21:32:00 +02:00
nemvar
21883b69ea compilegood 2019-07-28 19:56:49 +02:00
nemvar
ea6b398e2b Fixes this stupidity 2019-07-28 19:36:15 +02:00
nemvar
dabbd79ca9 Filthy override 2019-07-28 18:46:05 +02:00
nemvar
15c6dcc322 Switches some values around 2019-07-28 18:13:30 +02:00
Garen Crownguard
e851b6550a Cult hoods can be toggled (#45497)
* Cult hoods can be toggled

* oops
2019-07-28 05:00:50 -07:00
nemvar
a52b4ec73d Removes emag and emp species hooks. (#45478) 2019-07-28 04:41:42 -07:00
Garen Crownguard
bab2b442cb Fixes long hair going through hoods (#45500) 2019-07-28 04:34:35 -07:00
Akrilla
9df1854c20 Tweak contract roundend text (#45506)
Moves buys and (used X Rep) on same line
2019-07-27 20:21:59 -07:00
Dennok
213b86ca22 Shuttle-buttons (#45444)
connect_to_shuttle add shuttle id to connected machine id
Buttons from one shuttle dont controls machinery from another by default
2019-07-27 20:19:56 -07:00
loser
9b9e846ebc E (#45475) 2019-07-27 20:18:10 -07:00
Tlaltecuhtli
67fe38921a fireball starts at 8 tile range, increases 2 for every level (#45404)
* Update maps.txt

* 1

* levels
2019-07-27 20:09:46 -07:00
senjx
40fca141ef Fixes #44963, adds force and flag checks for items attacking brains (#45428)
* Adds force and flag checks for items attacking brains

Adds a force check and a NOBLUDGEON flag check for items that attack brains to prevent accidental or ridiculous brain damage via straw.

* Update brain_item.dm

* Adds force and flag checks for items attacking brains

Adds force and flag checks for items attacking brains to prevent accidental or ridiculous brain damage via straw/pen/whatever
Fixes https://github.com/tgstation/tgstation/issues/44963
2019-07-27 20:00:52 -07:00
py01
353ef81789 Magic projectile fixes (#45484)
* magic projectile changes

* fixes var path

* undoes magic changes

* magic proj changes

* am checkchaange

* removes bad refactor

* proper am check on mag missile

* locker staff fix
2019-07-27 19:58:58 -07: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
fb44479c0b Fixes the math 2019-07-28 01:00:43 +02:00
nemvar
091f221fe6 Fixed mood for real 2019-07-28 00:48:07 +02:00
nemvar
214a3d452a In how many ways can this be broken? Find out next time! 2019-07-27 23:58:11 +02:00
nemvar
f7c9751d69 Removes some istype(src) stuff 2019-07-27 22:55:49 +02:00
AarontheIdiot
debf6ad6d2 goggies (#45460) 2019-07-27 22:29:53 +02:00
bgobandit
a7fa319e36 Clicking the cloning pod examinates it. 2019-07-27 16:08:39 -04:00
TheChosenEvilOne
9227c18fc2 Hardsuit helmets protect against space again. (#45524)
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-07-27 17:31:07 +02:00
Tlaltecuhtli
c1176fdc24 you can press the conveyor switch in hand to link any not deployed belts to it (#45440)
* Update maps.txt

* 1

* belts

* sadsdfburerdfs

* Update conveyor2.dm
2019-07-27 04:47:15 -07:00
Dennok
776bf336a3 Update mecha.dm (#45438) 2019-07-27 04:45:26 -07: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