Commit Graph
173 Commits
Author SHA1 Message Date
Henri215andGitHub c4667311e7 Janitorial equipment tweaks and cleaners availability (#20037)
* Janitorial equipment tweaks and advanced cleaner

* cleaner availability tweaks

* old cleaner for drones

* Mop capacity buff

* advanced cleaner for sol traders

* conflict part 1

* Merge branch 'master' into janitorial_tweaks

* Revert "Merge branch 'master' into janitorial_tweaks"

This reverts commit 47129ea819.

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

This reverts commit a8c520b069.

* hahahahaha

* hahaha part 2

* hahaha part 3

* cerestation edit

* adv cleaner comes with 500 now and ERT belt

* lube spray upper case and moving it to spray.dm
2023-02-03 13:10:51 -06:00
b940c1eb21 Allows clings to regenerate without a brain. (#19856)
* Move brain organ code where it belongs

* Rename too

* WIP, but hey, it kinda works now.

* Account for a few missing heads

* Remove vital check, killing the user on death

* Let defibs and scanners better deal with these

* Remove debug brains

* Clean up some more contingencies

* More head checks

* Update code/modules/antagonists/changeling/datum_changeling.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Fixes up signal business

* some stuff from sean's review

* Add some type safety checks for heads

* oops

* Update code/game/objects/items/weapons/cosmetics.dm

get this in there too

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Remove decap sword

* Quick suggestions

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Addresses shedding problems

* Add new defib changes

* this is why we have CI

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-01-20 19:25:51 -05:00
AffectedArc07andGitHub 1feb9fbd38 [READY] Atmos Refactor Part 7 (I think) - Kills signals + TGUIs stuff (#19867)
* I AM NOT A KING. I AM NOT A GOD. I AM LUNACY.

* THE SCOPE CREEP

* This was done in vi. No langserver. Send help.

* Progress

* Some issues fixed

* The code builds, but the maps dont

* CC builds, I doubt anything else does

* Do this now

* Safety

* The map compiles

* THE MAPPING HELL

* Airlock controllers dont work

* Fixed bombs

* AND THATS FIXED

* Phantom edit

* Restores LL I think

* The mapmerge hooks are actually retarded

* Fixes spawners

* Half working air control

* Picky

* Hyper efficient tank monitor

* Sanity

* Laying the framework

* Improved alert console

* Dont think this is actually done anywhere

* Metering

* ONE HUNDRED AND ~~EIGHTY~~ TWENTY SEVEN

* WE ARE READY FOR BOX TO BUILD

* One map done

* Well that was easy

* Another one

* I think this is done

* I should have removed this

* I would make a russian joke but <current event>

* Delta WIP

* Makes delta work

* Early review

* TM safeguard

* oops

* METAAAAAAAAAAAAAAAAAAAAAAAAA

* Fix #4213

* Trailing

* oh for piss sake

* Shutter fix

* Roundstart ATs can go away

* Review pass 1

* What could go wrong

* BOOM BOOM BOOM

* Not needed

* Fix seed vault

* Oops

* Review changes
2023-01-03 20:59:35 +00:00
Vi3triceandGitHub 03ce2920e1 Defining Part 4 - Code cleanup toward defines (... and the rest) (#19388)
* I wasn't done

* nits
2022-10-28 19:28:23 +02:00
Farie82andGitHub 8386e9cdef Fixes waterpacks and friends not GCing (#19269)
Move nozzles to Initialize
Makes reagents not hold a reference to their atom when they get destroyed
2022-10-18 22:52:35 -05:00
edeba92326 Smoke spells readability (#19387)
* read the smoke

* oops

* contra

* contra

* more tidying

* last one

* Update code/modules/projectiles/projectile/magic.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-15 18:05:55 +02:00
LucandGitHub 2daa76e6fc Adds a special suicide action to air tanks (#18575)
* Add /tg/ tank suicide_act

* Review
2022-08-03 18:06:20 -05:00
Vi3triceandGitHub f4b37b4177 Port TG updating appearances (#17943)
* Get pants that match or else you gonna look silly yo

* Posters

* Fix other hud elements

* Rereviewed

* Update shotglass.dm

* Fix for new merged PRs

* Typo

* Coming across other stuff

* Update theblob.dm

* No takebacksies

* smh i forget to leave a comment

* Updated for the detgun and cards

* Should have rerun langserver again

* No longer plastic, more in scope

* Damn you bluespace

* Reverting turret logic, out of scope at this point

* Tweak that part

* Went over energy guns again, and fixed UI White's sprite sheet

* Welding masks, glasses, and JUSTICE

* Update portable_atmospherics.dm

* Cleaning up, clearing things up

* Review and suggestions

* Update valve.dm

* More tweaks

* Missing character

* Not distinct lightmasks, so they can be overlays

* Update generator.dm

* Add parameter so holodeck doesn't try to make a perfect copy

* Update unsorted.dm

* Spiders

* Better fix for spiders, fix vamps too

* Ghosts

* Update telekinesis.dm

* Cleaning up old procs

* It's set up to not copy datums... Unless they're in a list

* Donuts, duct tape, and detgun. D3VR coming to Early Access

* Update procs that interact with doors so they call update_state instead

* Forgot one spot, and actually might as well just force lock

* Cleaning up other things... Sigh, and kitty ears

* oops

* Getting used to how it works

* blinds

* Going back to the suit obscuring thing, so it doesn't update all the time

* Missed that from merging master

* I made this PR and forgot about it

* Fix runtimes in cards

* Make things a bit more unified

* Update update_icons.dm

* yarn, really?

* Update library_equipment.dm

* Update shieldgen.dm

* Every time Charlie merges something, I go back and see if I can improve things further

* what's this? more?

* Update misc_special.dm

* wow, paper

* Review

* More reviews

* To be sure, seems like being broken messed something sometimes

* Brought airlocks closer to how TG works to iron out some stuff

* Pizza and morgue

* Doesn't seem to hurt, tried with holodeck

* Revert "Doesn't seem to hurt, tried with holodeck"

This reverts commit 158529302b.

* Icon conflict

* Fix organ damage

* Don't ask how. Why. It's like that on prod too.

* Cutting down on things and updating from TG.

* More flexible. Just in case the thing you stuck it on didn't destroy.

* Hydro was one the things I touched earlier on, better rework it

* Reviews

* Cleaning up further, also bri'ish

* Undo a change I did, and switch over to a more recent implementation

* Update biogenerator.dm

* Rolling back to old airlocks, but with new duct taped note

* Functionally the same. I'd just rather not have the smoothing happen there

* Went over APCs again

* Fix welding helmet names in species files

* Update airlock.dm

* Update persistent_overlay.dm

* Oh, topic
2022-07-21 08:11:59 +02:00
6a91840962 Code Readability - Weapons (#18171)
* weapons

* weapons

* prefer explicit time

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Don't have code on same line as control statement

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-10 13:59:33 +01:00
Bm0nandGitHub 1d0e3dde0f Updates a considerable amount of legacy weapon sprites to modern TG/Bay versions (#18118)
* test

* holdup

* more guns

* EVEN MORE CHANGES

* fuck

* eugh

* actual shit editor, love DM

* i think I just need inhands now

* final review, test pr

* ooops

* holy shit

* new maka

* foamforce new makarov

* this is going to be hell to review. is it?

* AHHHHH

* small melee fixes

* GOD DAMN STAFF

* as above

* i thought i fixed you, also grip added to wt550 inhand

* acutally deconflicts with the new camera pr, removes the new animated missle(rip)

* some fixes

* a bit more sprite cleaning

* i am suffering

* reverts 9mm

* seemingly forgot a few

* i think we're good now
2022-07-07 17:12:28 +01:00
QwertytofortyandGitHub bc3c8c25bc Fixes watertank mister GC (#17258) 2021-12-20 21:23:51 +01:00
variableundefinedandGitHub fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines
Adds defines for damage flags
2021-09-17 22:10:20 -05:00
SabreML 6648d3131f Clothing Organisation V1 2021-08-24 18:37:48 +01:00
Mieszko Jedrzejczak 559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
S34NandGitHub 00de6dc6c1 Adds pref to remove internals pressure from status tab, adds it to inspect text (#16110)
* yeets the internals from status panel

* adds pressure reading to the tank inspect text

* Adds a pref toggle

* numbers are hard

* catchup with master

* Revert "catchup with master"

This reverts commit bb972cb110.
2021-06-17 10:30:30 +01:00
AffectedArc07 f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
Fox McCloudandGitHub 003a1f7cba Tank Refactor; Breathing Retool (#15371)
* Tank Refactor Breathing Retool

* missed maps and doc

* just in case
2021-01-28 20:57:37 +00:00
AffectedArc07andGitHub 44012814d0 Merge branch 'master' into nanoui-is-dead 2020-11-26 09:34:14 +00:00
AffectedArc07andGitHub 03934e8171 Nukes recursive effects (#14936)
* [WIP] Nukes recursive effects

* Finishes the rest of the stuff

* Mochi tweaks
2020-11-25 23:59:30 -05:00
AffectedArc07 54dd2765b4 Converts all tgui_ to ui_ 2020-11-21 12:10:58 +00:00
AffectedArc07andGitHub 2c37ae8fd0 The road to Initialize() stability - Enforcing parent call on New(), Initialize() and Destroy() (#14719)
* The road to Initialize() stability

* Fixes sanity, for now
2020-10-28 12:35:36 -04:00
IrenandGitHub 4a21b6787f Code Standarisation - Tank Distribute Pressure (#14562)
* Code Standarisation - Tank Types

* Tank Distribute Pressure Standardisation

* Anesthestic Tank at O2 Standard

* Update tank_types.dm

* Distribution Pressure Fix

* TANK DEFAULT RELEASE PRESSURE
2020-10-17 13:16:46 -04:00
Kyep 9a3ecd6383 Fix runtime when activating internals while smoking 2020-09-24 14:00:39 -07:00
TDSSSandGitHub 328b7fa8d8 ERT idiotproofing and minor tweaks (#13834)
* makes ert more robust

* renamed and tweaked

* idiot proofing of ert

* I cannot into git, oops

* removed the anti-stun from code red erts again

* removed implied src
2020-09-16 16:38:25 -04:00
AffectedArc07andGitHub 90fd9a8fb8 Removes all relative heresy (#13969)
Removes all relative heresy
2020-09-16 12:52:20 -04:00
AffectedArc07 e12701c453 Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14022 2020-09-15 16:23:11 +01:00
SteelSlayer 6e641db3fe Merge remote-tracking branch 'upstream/master' into internals-auto-push-up 2020-08-25 16:39:08 -05:00
Kyep 3c7b69557a mochi case handling 2020-08-07 05:09:49 -07:00
Kyep f0aede7898 TGUI port of internals tanks 2020-08-07 02:14:06 -07:00
Fox McCloud c4143aedf0 Purges Rigs 2020-07-01 13:09:15 -04:00
Fox McCloudandGitHub 69de03a622 Gas Mixture Refactor (#13602)
* Gas Mixture Refactor

* derp

* defined turf types

* fixes

* cuts turf visuals cost in half

* even better equalizing with planetary atmos

* remove volatile fuel

* comment and documentatino on turf gas vars
2020-06-24 17:48:50 -06:00
joep van der velden 279ac042d8 Makes the water tank backpack nuzzle not have antidrop 2020-04-21 11:50:27 +02:00
AffectedArc07andGitHub 210f8badf4 Makes all global variables handled by the GLOB controller (#13152)
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
2020-03-20 21:56:37 -06:00
SteelSlayer 5a699e5232 CRLF to LF 2020-03-18 12:06:47 -05:00
SteelSlayer 99aefa9082 Merge branch 'master' into internals-auto-push-up 2020-03-18 12:03:13 -05:00
AffectedArc07andGitHub 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
SteelSlayer 84271962fe Internals activation QoL tweak 2019-12-26 05:04:41 -06:00
Fox McCloud 20c4cf0a08 for-if-I-stand-I-stand-by-his-will-alone 2019-10-03 19:52:03 -04:00
Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
farie82andvariableundefined 0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud 238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
2019-09-21 12:40:07 -04:00
Fox McCloud aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Coul d89d4dbc38 fixes some missing arguments and runtimes 2019-09-16 16:18:16 -04:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud 1bfb442d40 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-14 21:15:31 -04:00
Fox McCloud f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
Fox McCloud 42564c65f3 Refactors Atmos Air Current Pushing 2019-09-09 20:11:26 -04:00
Fox McCloud b4863db46f further tweaks 2019-09-05 18:44:55 -04:00
Fox McCloud dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
Fox McCloud 899eb9c948 Ports Jetpack Upgrades. Removes Jetpack Suit Storage 2019-08-26 00:11:42 -04:00