Commit Graph

9761 Commits

Author SHA1 Message Date
Qwertytoforty
5da3a6b843 pyro gloves only work on hands [GBP NO UPDATE] (#19094) 2022-09-18 13:36:23 +01:00
ElorgRHG
e4e06f2759 Paradise's soul removal part one of many: Captain's drip and resprite (#18891)
* The sprites and stuff

* Vox re-add

* Why did I do this

* Last tweaks

* Pixel differences

* I have decided that captains need a beret

* I have decided that Ian needs drip too

* This exists sadly

* I forgor the gloves 💀

* CONFLICTSSSSSS

* "empty" commit

* White tunic

I don't get the appeal still

* bluE

* Painful

This will most likely get closed anyway so whatever

* OLD TUNICCCCCCCCC

* Conflicts

* Loadout captain's berets

* More conflicts, yay
2022-09-17 11:13:58 +01:00
Henri215
3d2092885f Bronze/Glass ashtray now can be made (#19056)
* ashtray crafting

* added timers
2022-09-17 10:51:02 +01:00
warriorstar-orion
4874032e80 Reset personnel locker overlays when lock/unlocking. (#19073) 2022-09-17 10:46:55 +01:00
Qwertytoforty
f9defc92bf Adds Fusion Gauntlets to RND (#18804)
* do a once over first

* merge conflict shit

* armor pen to modern stuff

* Apply suggestions from code review

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

* BOY SMELL THEM MERGE CONFLICTS

* icons / final changes

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-09-17 10:45:58 +01:00
warriorstar-orion
4a77fd51c2 Don't spawn spiderling remains for grown spiders. (#19070)
* Don't spawn spiderling remains for grown spiders.

* style
2022-09-16 22:51:19 -05:00
Qwertytoforty
dcef39ec25 pyro anomalies no longer light people on fires through walls (#19060) 2022-09-16 21:11:08 -05:00
Luc
346a1b8142 Yet Another Surgery Refactor (#18325)
* Initial commit

Fixes up surgery.dm
Adds some tool behavior

* More basic changes

* Checkpointing: this is a little gross right now

* Add signal COMPONENT_CANCEL_ATTACK_CHAIN

* Cleans up surgery initiator

* Mostly gets surgery (and canceling it) working

* Add abstract proxy surgery steps

Also adds them to organ manipulation

* Clean up most existing surgeries

* Rework organ openness, adds define for aborting a beginstep

* surgery works again, also implements retry defines

* fix surgery computer

* add limb repair to synth implant removal

* retry implant checks

* Clean up abductor surgeries as well as some other things

* A lot
- Reworks organ manipulation to use a series of surgery steps instead
- Fixes some runtimes with open hands
- Lets mito zero out the germ level while treating necrosis
- Adds a debug surgery tool

* add debug surgery tool, note some TODOs for later

* Add conditional check for surgeries repeating

* update surgery retry logic to make it more of a bonus

* Lets abductors automatically retry any failed surgery steps

* Rework robotic surgery to use abstract/proxy steps

* Bunch of bugfixes and more!
- Limb reattachment works properly now, you can just slap a limb onto a person
- If the limb isn't robotic, it'll be useless until the surgery is finished with a hemostat, though it might be enough to get the patient out of the OR.

* Remove more now-implicit checks

* Slight reorganization

* more fixes across the board

* Remove unused variable

* Trying not to lose my mind here
- Does away with can_run() entirely
- Cleans up visible messages in code
- begin steps should now all have ..() afterwards
- slime bone surgery should be fixed now
- more docs

* Robotic  surgery is stoppable with a crowbar, all surgery can_start now checks parent

* Fix some broken robotic typepaths

* Typepath fixes, do away with some last TODOs

* Forgor

* Last cleanups before we go gold

* jk lol

* Make early surgery termination clearer

* More "last" cleanups

* Fixes tool flags, surgery initiation

- Fixes surgery not being startable by sharp objects
- Moves surgical tool flags to item traits

* Clean up surgery cancellation, especially for borgos

* I think this should GC better

* Apply suggestions from code review

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

* Status is now step number

* Add a 20% chance to find nothing during organ manipulation

* Improve documentation, make forced_surgery a normal arg

* Charlie's reviews

* Why are abductors like this

* Little more verification, ensuring limb augmentation and organ manip healing work properly

* Fix torso organ manip being unfinishable

* Fix cavity implants, open-hand/any item steps

* Make sharp objects not try to start an operation with help intent

* Comments, quick target fix

* Re-order list so advanced bruise pack is pulled first

* Make surgical gripper function like an open hand

* Make mito only use one unit per organ for now

* Check if user is on operable surface before trying to operate

* Reduce admin logging

* Fix some bugs that appeared during the testmerge
- you can no longer start robotic surgeries with a scalpel (lol)
- you can now cancel surgeries on the first step after I fixed some bugs that I introduced (woo hoo)
- Synthetic limb attachment is now combined into a single startable surgery step, though still retains the fun flavor of both

* Swats some more bugs
- (hopefully) fixes a huge source of runtimes where we tried to check if we could run surgeries before checking if the surgery used an organ
- In doing so, moves the logic for determining if a surgery can start to the mob-level
- Fixes robotic reattachment surgery not working

* multi-bug drifting???

- Fixes a bug where a branching surgery with an any tool option could possibly override a step with a matching tool
- Fixes some intermediate surgeries failing due to not having specified possible_locs

* A few more fixes
- Fixes any surgery tool steps again
- Fixes cavity surgery again

* Hopefully fixes getting stuck in robotic organ manip

* Remove extra parent call

* Steel review

* Steel review

* Fix spacing for possible locs

* Roundstart traits

* Advanced surgical traits and other hal fixes

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-09-16 18:48:43 +01:00
Henri215
7ff1418ae4 add cloth foot wrap recipe (#19052) 2022-09-16 18:36:51 +01:00
Contrabang
dffdf8c7c1 Adds icon_states to telescopic batons (#19074)
* mapping batons

* lets have them off
2022-09-16 18:14:37 +01:00
Adrer
bfacc81b97 Makes empty implanters initialize properly. (#19043)
* Empty implanters initialize properly

* Sean's suggestion

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

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2022-09-14 23:14:46 +01:00
FloFluoro
4431ddd01a Fixes runtime on dehydrated space carp (#19004)
* Fixes runtime on dehydrated space carp

* Oops

* *screaming noises*
2022-09-13 17:53:08 +01:00
Contrabang
5e72865320 Mapping indictors for lootdrops are readable now (#19009)
* removes-the-colors

* forgot this
2022-09-12 22:31:40 +01:00
Bm0n
fb089794e7 Remakes PR #17569, gives all special armours full body coverage (#18911)
* IT'S BACK

* merge conflict

* very slight change on the vox sprite

* accounts for the armour refactor

* deconflict?

* ok lets not conflict

* ablative trenchco

* garment bag
2022-09-07 18:34:30 +01:00
Contrabang
03effa935c Adds several more icons to tool-belts (#18967)
* oh wow! more icons!

* hal review
2022-09-07 15:28:06 +01:00
Contrabang
0336e122ee this was meant to be a one line change (#18982) 2022-09-07 13:40:25 +01:00
Contrabang
1f2b29bd80 style changes (#18964) 2022-09-07 13:39:23 +01:00
S34N
ba802a199a Makes large jungle bushes use the tree transparency system (#18953)
* large jungle bush transparency

* size
2022-09-07 13:38:18 +01:00
S34N
ea0c492094 CC tcomms QoL (#18827)
* auto-relinking!

* makes these work everywhere

* makes it clearer this is a UID

* works

* fix

* Update code/game/machinery/tcomms/presets.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-09-07 13:36:40 +01:00
Qwertytoforty
7d9213e0c2 Ports TG cursed katana to replace our cursed katana. (#18757)
* Ports TG cursed katana to replace our cursed katana.

* OH, IT'S JUST A SIMPLE NUMBERS GAME!

* More changes / additions / removals

* unneeded comments

* more things

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/__HELPERS/lists.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/modules/mining/lavaland/necropolis_chests.dm

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

* should have commited this too

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

* Update code/game/gamemodes/wizard/spellbook.dm

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

* removes status, death signal, turf rename, return true

* sprites my hated

* Hal / steel requested changes

* built in

* quest 1/2

* Extra spacing / github instantly resolved status_effects and did not let me change it.

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-09-07 13:36:29 +01:00
FloFluoro
87caa9532b Adds the "Jestographic Sequencer", a clown-exclusive traitor item (#18933)
* Initial commit

* Removes ability for AI/door remotes to interface with cmagged doors

* Adds cleaning method, fixes windoor functionality, makes cmag slippery

* Cleaning cmagged doors checks for remaining space cleaner, cleanup

* Reduced TC cost from 6 to 4, fixed small bug

* Code review super happy funtime

* Adds cooldown to cmag airlock chuckle

* Cleanup, cmag door laugh no longer sounds through walls (again)

* Prevents blank spare IDs from passing through cmagged airlocks

* Cleanup

* Cmagged state is now carried by a trait instead of a global var, cleanup

* Adds early return that I missed, fixes small bug)
2022-09-05 15:35:45 -05:00
Vi3trice
5740ea2df6 [GBP: No update] Fix odd airlock interference with polarized airlocks (#18938)
* Update airlock.dm

* Update airlock_painter.dm

* Update airlock.dm

* Cleaning up the unres proc.
2022-09-04 17:20:21 +01:00
Contrabang
e8e705adf0 red (#18947) 2022-09-04 14:23:56 +01:00
Octus
1c7882cb11 Ports the TG Dish Drive. A quality of life machine for service. (#18855)
* ILOVEBARTENDING

* improvements

* oopsie daisy

* Apply suggestions from code review

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: ElorgRHG <71735193+ElorgRHG@users.noreply.github.com>

* Update cable.dm

* fixes cable runtimes

* Apply suggestions from code review

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

* applies for code critique

* steelslayerreview

* Update code/game/machinery/constructable_frame.dm

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: ElorgRHG <71735193+ElorgRHG@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-09-04 10:36:11 +01:00
S34N
021fd9a416 adds implants and hair gradients to serialisation (#18934)
removes organ DNA from serialisation
2022-09-03 21:14:44 +01:00
Sirryan2002
520b0914ab [TGUI] Implant Pad + Implanter Related Sprites + Slight Implant refactor (#18556)
* holy guacamole

* TGUI capitilization

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* TGUI rebuild

* implements requested changes

* fixes

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Apply suggestions from code review

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

* fulfilling more requests

* uplink fixes

* init order stuff

* charlies requested changes

* Apply suggestions from code review

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2022-09-03 00:33:58 -05:00
Adrer
9d6ceeb47b You can no longer pull something you're buckled to. (#18957)
* No longer possible to pull something you're riding

* hal9000PR is redundant

* remove brackets

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2022-09-02 18:34:57 +01:00
Adrer
99c6945644 Window needs to be screwed to floor before being put in frame (#18935)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2022-08-31 13:22:14 +01:00
Pidgey
ddfecf85f5 - Converts honeycomb from reagent_containers to type reagent_containers/food/snacks. (#18922)
- Adds honeycomb as an item that can be picked up in plant bags.
2022-08-31 13:20:26 +01:00
Contrabang
9e5999e8bc Allows toggling of crate locks with Alt-Click (#18906)
* wowee! easy of access!

* SR changes

* Revert "SR changes"

This reverts commit 1db0d2c1e6.
2022-08-31 13:16:50 +01:00
Adrer
9aed532f42 Improves thermal drill clarity (#18924)
* Improves thermal drill clarity

* Also remove progress bar on stop

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2022-08-30 18:09:46 +01:00
Contrabang
c61a500319 Fixes some broken code with a dirt grenade (#18928)
* i hate old code i hate old code

* good fix im so good at code
2022-08-29 23:05:38 +01:00
Adri
9c1618139b Tweaks some NanoMed Plus products, tweaks mannitol and mutadone pills, renames healing patch (#18904)
* Changes mannitol and mutadone pills

* Renames healing patch to brute patch

* Removes some NanoMed Plus products

* Moves insulin to contraband

* Removes unnecessary capitalization when it comes to reagent bottles

* Reverts mannitol sprite change

* Moves health analyzer upgrades from Nanomed plus to wall nanomed premium category

* Makes syringes lowercase

* Revert "Moves health analyzer upgrades from Nanomed plus to wall nanomed premium category"

This reverts commit 3d586665fe.

* Renames prespawned advanced analyzers
2022-08-29 11:10:16 +01:00
Vi3trice
b5955dc22d Expand electrochromic devices. Add airlocks, windoors, and window painter compatibility. (#18656)
* The future is hazy

* Deconflict and linters

* Update windowdoor.dm

* Update airlock.dm

* Update airlock.dm

* What was even the point of visible?

* Fixes

* Update tgui.bundle.js

* Update windoor_assembly.dm

* Update airlock_painter.dm

* Update tgui.bundle.js

* Ain't no wizard

* Update RCD.dm

* Tweaks
2022-08-29 11:07:38 +01:00
Kugamo
247c7239da InteliCard AI Core Display Sprites (#18821)
* hi

* bye

* hi again

* Sirryan2002 suggestion

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

* adds unit test

idk what Im doing really here, so I hope this code works 😔 👍

* correction 1

* correction 2

kill me

* correction 3

im dead

* correction 4

big pepega moment

* correction 5

* correction 6

yep

* FINALE :D :D :D

* AffectedArc07 suggested change

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-08-28 14:37:08 +01:00
Sirryan2002
b4539344e4 Minor Mountable Frame Code Refactor (#18738)
* bugfix turned into a refactor

* fixes exploit with producing infinite metal

* Update code/__DEFINES/construction.dm

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-08-27 16:04:43 -05:00
GDN
7eb65e8831 Fixes pull-able glowshrooms (#18905) 2022-08-27 14:45:21 -05:00
AffectedArc07
1c3dc66b79 Refactors light switches, igniter switches, mass driver buttons, and crematoriums? (#18683)
* A mixed refactor

* Re add link code

* tweak

* well thats embarassing

* Apply suggestions from code review

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-08-27 13:04:31 +01:00
ElorgRHG
628748a1ee Adds garment bags to reduce locker clutter: Paradise edition (#18869)
* Garment bags

* Small prevention of gaming

* Larger prevention of gaming

* This looks better I think

* Holding a LOT of clothing in your backpack seems like a bad idea
2022-08-25 16:40:39 +01:00
S34N
41813c3e5f Various fixes and QoL tweaks to labor camp (#18841)
* gulag QoL fixes

* escape route, analyzer

* stops people from spam calling the shuttle down

* unifies access

* moves ofitser, fixes point claim console

* TGUI build

* unifies point system for good

* TGUI deps

* tweak

* sirryan review

* hard ref removal

* more changes

* scope creep scope creep

* sirryan!
2022-08-25 16:36:36 +01:00
PopeDaveThe3th
5833f98ac5 Buffs the powerfist (#18798)
* Buffs the powerfist

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

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-08-25 16:29:43 +01:00
Luc
ad813f76d9 Allow cursed heart to be defibrillated up to three times (#18677)
* cursed heart but funny

* Flesh out this version a bit more

* okay fine you get three shots

miner gaming

* Bitwise

* Change wakeup method

* Address Steel's review
2022-08-24 12:00:25 -05:00
Gatchapod
81a6cb2417 Moves chainsaw buff application to afterattack() (#18820)
* Moved chainsaw buff to afterattack()

* Fixes to oversights I wasn't aware of

* Actually fixes things

* Dangling return

Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com>
2022-08-22 23:06:26 +01:00
GDN
28137689b8 Swarmer removal (#18873) 2022-08-22 19:50:18 +01:00
Qwertytoforty
afbae8af1b Makes anomalies deadlier (#18836)
* Makes anomalies deadlier

* Apply suggestions from code review

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

* undodgeable to dodgeable

* requested changes

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-08-21 16:32:12 +01:00
SteelSlayer
358ff86ddb Removes the need for ComponentInitialize (#18833)
* removes `ComponentInitialize`

* mapload

* add back CRASH
2022-08-18 22:00:19 +01:00
PopeDaveThe3th
313394de2f Buffs His Grace (#18817)
* Buffs his grace

* Update code/game/objects/items/his_grace.dm

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-08-18 14:39:26 +01:00
Contrabang
d6b38aa9ff Makes defib shocks dangerous (#18809)
* wow this is funny

* remove prob at Hal suggestion

* lewcc suggestion

* hal review
2022-08-18 13:49:52 +01:00
Vi3trice
333e3a4f67 huh (#18848) 2022-08-18 10:47:50 +01:00
Qwertytoforty
432985b545 a cutting edge fix (#18849) 2022-08-17 22:33:01 +01:00