Commit Graph

24795 Commits

Author SHA1 Message Date
FloFluoro 15a0edc588 Fixes facehuggers facehugging forever (#19067)
* Fixes facehuggers facehugging forever

* Removed unnecessary "as mob", readded blindness because clothing-induced blindness doesn't fully mimic the status effect
2022-09-16 22:45:52 -05:00
Henri215 ae3b614e78 fix clawgame double prizes (#19061) 2022-09-16 21:14:50 -05:00
Vi3trice 2d12541dce Well then (#19055) 2022-09-16 20:25:41 -05:00
Henri215 1c1f823bff ORM: Improved alloy naming (#19065)
* ORM improved alloy name

* capital letter

* Update code/modules/research/designs/smelting_designs.dm

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

* added spaces before (

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-09-16 18:06:19 -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 c5d575dacb Give directions to EM (#19039) 2022-09-16 18:14:55 +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
Luc 686cd5fd79 Fixes emotes being displayed as the wrong type (#19026)
* Fixes some emote types, fixing the voice analyzer by proxy

* Remove unused utility function
2022-09-16 17:52:17 +01:00
warriorstar-orion b230c76ba8 Spelling fix on admin autofax responses. (#19014)
* Spelling fix on admin autofax responses.

* fix tag letter-casing in replies too
2022-09-16 17:52:07 +01:00
Contrabang 37a3902a83 Changes SR to not be an instant and unavoidable revival. (#18910)
* SR changes

* they really should explode before anything else

* Update code/modules/reagents/chemistry/reagents/medicine.dm

this is what i get for ~~stealing~~ reusing code

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>

* allows for people with no client to be revived

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>
2022-09-16 17:51:46 +01:00
Qwertytoforty e275183ddd Xenomorphs can now stun borgs for practical ammounts of time. (#19050)
* god damn it.

* was cycles not seconds
2022-09-16 17:51:34 +01:00
Edan 27509fc5b6 based (#18991) 2022-09-14 23:27:17 +01:00
FloFluoro 3974a98073 Facehuggers no longer instastun, removes some RNG (#19025)
* Facehuggers no longer instastun

* Changed egglaying time to actual seconds

* Code review

* Autodoc, typos, etc.
2022-09-13 23:22:39 +01:00
Qwertytoforty ae0efa00b5 Ports the shuttle console hijack from TG. Tweaks malf AI hijack. (#19018)
* *puts on sunglasses* "I'm in."

* whoops

* Apply suggestions from code review

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

* Caching, danger, range, xenomorphs can no longer hijack

* Update code/modules/shuttle/emergency.dm

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

* Update code/modules/shuttle/emergency.dm

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

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-13 23:22:19 +01:00
FloFluoro b8885719f4 Xenomorphs can now die (#19046) 2022-09-13 22:53:06 +01:00
FloFluoro 4c2da8fc28 Fixes Xenomorphs being able to build resin structures in space (#19028)
* Fixes Xenomorphs being able to build resin structures on turfless tiles

* powerc my beloathed

* When the return is indented!
2022-09-13 22:42:10 +01:00
alex-gh 6ce0ab1837 Adds non-contagious disease berserker to the disease blacklist for disease outbreak (#19003) 2022-09-12 22:32:11 +01:00
Contrabang e88b25bb24 wooohoo! I can see demons! (#19020) 2022-09-12 22:31:59 +01:00
Contrabang e52330c553 Forensic gloves now have their own worn sprite (#18987)
* wow cool gloves

* gloves.dmi
2022-09-12 22:26:48 +01:00
AffectedArc07 279ee1dc12 Fixes a ton of security issues (#19005) 2022-09-10 14:12:16 +01:00
alex-gh 474fc426a7 Combines the major disease outbreak event with the moderate. (#18971)
* Rolls the major disease outbreak event into the moderate

* Fix compiler warning

* removes major into moderate config
2022-09-09 20:35:24 -05:00
DamianX ed9e232af5 Fixed localhost autoadmin for the re-admin verb (#18897)
* Fixed localhost autoadmin for the re-admin verb

* Update code/modules/client/client_procs.dm

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-09-08 23:51:39 -05:00
Neth c5b32512ab Adds Species Drinks (#18734)
* Merge

* linter be nice

* memes--

* removed force-says and force emotes

* changed Skrell drink

* modified Skrell drink

* review fixes

* changed grey drink

* fixed conditions

* fixed an oopsie

* more fixes

* facepalm
2022-09-08 22:10:18 +01:00
Gatchapod 34593d2013 Gnashing Teeth buff - make it sharp (#18931)
* Sharpen the teeth

* Requested changes

Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com>
2022-09-08 13:21:18 +01:00
Qwertytoforty c7fb93075c fixes katana runtime (#18993) 2022-09-08 12:38:38 +01:00
FloFluoro 1d6e105f8a check_id now checks for ID in the PDA slot (#18992) 2022-09-08 12:21:30 +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
Ordosian 72d0990f3f Timestamp QoL (#18878)
* Timestamp QoL

* Fixed Proc

Co-authored-by: Ordosian <Ordosian@gmail.com>
2022-09-07 15:41:48 +01:00
Contrabang fc4a0ea4d6 wow diagnostic hud (#18974) 2022-09-07 15:28:18 +01:00
GDN c7bb5763d7 Removes weakens on tripping over simplebots (#18965)
title says all
2022-09-07 13:39:45 +01:00
Contrabang 1f2b29bd80 style changes (#18964) 2022-09-07 13:39:23 +01:00
Contrabang 9bab3450cd why is it normal sized (#18963) 2022-09-07 13:39:11 +01:00
Adri 5e8930bec0 Fixes the dimensional rift being able to spawn in maintenance (#18954)
* Unifies findEventArea()

* Removes an unused area
2022-09-07 13:38:48 +01:00
Christasmurf 8a47325d33 Cargo/Mining bomber jackets, minor tweaks to allowed items in cargo wintercoats (#18914)
* cargo and mining bombers and stuff

* changes requested

* reorder loadout
2022-09-07 13:37:15 +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
S34N 633393f575 Adds config option to prevent repeating maps (#18950)
* the map vote sound now haunts my dreams

* aa

* Update config/example/config.toml
2022-09-06 10:31:03 +01:00
Qwertytoforty b1be1b5a36 Ports TG berserker armor from TG to replace champion hardsuit. (#18854)
* NT does not recommend punching fauna to death

* need x2, don't want reflection

* Armor -> brute burn resist, speed removed

* phys not species

* light em up

* Apply suggestions from code review

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

* a hex on you

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

* spacing, bolding, only stamina

* Apply suggestions from code review

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-09-06 00:05:36 +01:00
Edan 58f0419399 Legion Rework (#18819)
* initial changes

* crusher trophy + other changes

* oops

* status effect change

* charlie review 1

* spacing

* sentience type

* Update code/modules/mining/equipment/kinetic_crusher.dm

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

* Update code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-09-05 01:11:49 +01:00
ElorgRHG a2aaad2166 Gray black gloves and crappy shine on jackboots begone (#18909) 2022-09-04 17:20:12 +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
Adrer bb12be2ed1 Meteorshot now knocks down instead of stunning (#18955)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2022-09-03 16:22:14 +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
S34N 08f36a9521 Admin QoL: Deletes stickybans, tidies mob VV menu (#18943)
* 1

* 2

* removes these too
2022-09-02 23:51:00 +01:00
ParaGitV e13353e77e Spraytan overdose update (#18788)
* Spraytan Line Updates

* Punctuation update
2022-09-01 15:20:24 +01:00
Nathan Winters 417ad89267 Small container transfer rate change improvements (#18780)
* Avoid extraneous warning on `set_APTFT()` cancel

* Add `set_APTFT()` success feedback message

* Standardize `possible_transfer_amounts`

* Cryptic var names begone

* Unhardcode "It will transfer X units" examine note

* Fix grammar
2022-09-01 13:31:18 +01:00
alex-gh 7e3dda4556 Rework disease outbreak event (#18654)
* Rework disease outbreak

* Better dchat message

* Mary had a little lamb

* no symptoms for carriers

* Review Fixes part 1

* Review Fixes part 2

* Review Fixes part 3

* Lowers mundane disease probability

* Mundane disease can only happen once

* Improved naming/dchat message

* subtypes!

* space

* fix diseases overwriting each other

* SPAAAAAACE

* dchat message fix

* no initial
2022-09-01 12:49:27 +01:00
LiberatedWaveMan 980bbb489d Adds a New Drink: The Bilkshake (#18932)
* Update drinks.dmi

* Update alcohol.dm

* Update drinks.dm

* Update drinks.dm

* Update code/modules/reagents/chemistry/recipes/drinks.dm

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

* Squashed commit of the following:

commit c61a500319
Author: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date:   Mon Aug 29 18:05:38 2022 -0400

    Fixes some broken code with a dirt grenade (#18928)

    * i hate old code i hate old code

    * good fix im so good at code

commit 034a6403da
Author: Gatchapod <20936555+Gatchapod@users.noreply.github.com>
Date:   Mon Aug 29 23:01:52 2022 +0200

    More positions for body scanners and sleepers when using a wrench (#18815)

    * Adds positions to sleepers and scanners

    * Requested changes

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

commit 7b8f0f3d66
Author: Octus <62493359+Tokorizo@users.noreply.github.com>
Date:   Mon Aug 29 11:17:25 2022 -0500

    The Bartender's shaker now acts like a real shaker! (#18852)

    * SHAKESHAKERHSKAERIT

    * Update code/modules/food_and_drinks/drinks/drinks.dm

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

    * maint recommends

    * Update code/modules/reagents/chemistry/holder.dm

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

    * STOP SHAKING MF

    * Update code/modules/food_and_drinks/drinks/drinks.dm

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

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

commit 8a10336780
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Mon Aug 29 16:45:49 2022 +0100

    The headcoder shuffle (#18923)

commit 629c099db7
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Mon Aug 29 16:45:29 2022 +0100

    Refactors status displays (#18811)

    * Refactors status displays

    * biggest commit

commit 5d3310cdef
Author: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Date:   Mon Aug 29 15:39:56 2022 +0100

    Bag icons fixes + Extra bag sprites for vox/grey (#18903)

    * icons

    * dufflehandle

* Update drinks.dmi

* Update code/modules/reagents/chemistry/recipes/drinks.dm

thanks hal

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

* Update code/modules/reagents/chemistry/reagents/alcohol.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@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-08-31 16:07:49 +01:00
Adri 072fc6e1d5 Fixes tower cap logs being choppable in bags (#18939) 2022-08-31 15:06:16 +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