Commit Graph
4623 Commits
Author SHA1 Message Date
ContrabangandGitHub cfd30f5c6a fix to fix to fix (#19301) 2022-10-07 13:52:44 +02:00
e4bfa0e2f7 Fix #18872 Shark teeth is no longer invisible (#19229)
* picks teeth icon instead of shards (large/medium/small)

* Update code/modules/fish/fish_items.dm

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

* contrabang suggestions

* suggestion

* Apply suggestions from code review

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

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

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

* verb and state icons

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-07 13:49:43 +02:00
ContrabangandGitHub 8418997ed8 Moves most screwdriver checks to screwdriver_act (#19024)
* screwdriver_act my beloved

* convert to returns instead of . / lewcc review

* it will be done

* i'm a little bit stupid, but now time to test

* sometimes I get excited and press the commit

* The great test has been completed

* oh wow oh wow, lewc review

* found one last one

* Steel review

* Lewc review

* quick sirryan review

* removes stupid comments (old coders I blame)

* sirryan review two

* whoops...

* hal review

* the fix to the fix to the fix

* Revert "the fix to the fix to the fix"

FUCK I pushed to the wrong branch
This reverts commit a96fe98781.
2022-10-06 09:30:33 +01:00
McRamonandGitHub 888c78e160 New ability icons (part 1) (#19261)
* Removes unused sling icons

* first wave of icons

* more icons and stuff

* more icons and fixes

* mindswap fixed

* more actions.dmi adjustments

* some more

* dust biochip unique icon

* small fix

* test

* Update actions.dmi

* mhm

* reverse of some changes that are pointless as it stands

* Update implant_dust.dm

* bio-chip icons

* dust_implant new icon path

* missing icon for human form cling ability added

* removed the directional icons of the immrod action icon (yes)
2022-10-05 22:54:38 +01:00
ContrabangandGitHub 94f85b8837 Makes RPDs not smash pipes when placing a new pipe (#19205)
* rpdrpdrpdrpd

* lewc revision

* whoopsies I accidently removed a param
2022-10-04 22:18:23 -05:00
ContrabangandGitHub e8cdadbd52 implant merge (#19282) 2022-10-04 16:35:50 +01:00
FloFluoroandGitHub 6a876e1994 Standardize cleaning object behavior into "cleaning_act" proc (#19001)
* Standardizes cleaning item functionality into "cleaning_act" proc

* Culling commented-out code

* Damp rag now checks for humans before cleaning

* Change proc scoping, moved mop reagent check out of cleaning.dm

* Adds can_clean and post_clean procs to handle mopping, removes ismop parameter

* Adds can_clean() to cleaning objects/mobs

* cleaning_act() now carries message strings as params

* Refactored cleaning_act() for earlier returns and less redundancy

* cleaning_act now runs on the target atom, instead of the cleaning object

* Changed turf checks to overrides, rescoped clean_turf, lots of tidying

* Removed cleaner param from post_clean, since it'll always be src

* Code review tidying

* Tidying..........

* Removed clean_turf and put its functionality in turf/simulated/cleaning_act(), added new param to keep track of original targeted object

* Moved cleaning.dm from datums to code/game/objects

* Added early return, defined cleanspeed in seconds
2022-10-03 20:25:00 +01:00
Henri215andGitHub 77258c2ffd flyswatter fix (#19180) 2022-10-01 17:59:25 +02:00
Henri215andGitHub 5fc267c58d Adds in hand sprites for plastic fork, pspoon, pspork, pknife and spork (#19082)
* adds in hand sprites for pfork/pspoon/pspork

* added in hand sprite for plastic knife

* forgot to add left hand for spork,spoon and fork

* no idea how that sprite got removed

* fix spork icon and add right hand

* left hand for spork

* ??

* fixing conflict mistakes

* test

* ..

* left hand fix

* fix of the fix
2022-10-01 00:18:09 -05:00
S34NandGitHub d984808100 sirryan did this to me (#19176) 2022-09-29 20:43:10 +01:00
b3cd14d3ad Reworks nanocalcium injectors to be better. (#19122)
* Reworks nanocalcium injectors to be not shit

* better

* no s

* better math

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

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

* removes dead, updates percent

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2022-09-25 17:48:12 +01:00
924e8cc949 Renames non-cybernetic implants to bio-chips (#18937)
* CHIPS

* microchip implanter

* more chips to purge

* bio-chip

* catches more things

* tgui

* final merge changes

* Update code/game/machinery/cloning.dm

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

* oops

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-09-24 14:24:25 +01:00
QwertytofortyandGitHub 5da3a6b843 pyro gloves only work on hands [GBP NO UPDATE] (#19094) 2022-09-18 13:36:23 +01:00
ElorgRHGandGitHub 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
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
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
ContrabangandGitHub dffdf8c7c1 Adds icon_states to telescopic batons (#19074)
* mapping batons

* lets have them off
2022-09-16 18:14:37 +01:00
AdrerGitHubS34Nadrermail@gmail.com <adrermail@gmail.com>
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
Bm0nandGitHub 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
ContrabangandGitHub 0336e122ee this was meant to be a one line change (#18982) 2022-09-07 13:40:25 +01:00
ContrabangandGitHub 1f2b29bd80 style changes (#18964) 2022-09-07 13:39:23 +01:00
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
FloFluoroandGitHub 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
ContrabangandGitHub e8e705adf0 red (#18947) 2022-09-04 14:23:56 +01:00
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
S34NandGitHub 021fd9a416 adds implants and hair gradients to serialisation (#18934)
removes organ DNA from serialisation
2022-09-03 21:14:44 +01:00
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
PidgeyandGitHub 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
ContrabangandGitHub 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
Vi3triceandGitHub 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
ElorgRHGandGitHub 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
S34NandGitHub 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
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
LucandGitHub 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
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
SteelSlayerandGitHub 358ff86ddb Removes the need for ComponentInitialize (#18833)
* removes `ComponentInitialize`

* mapload

* add back CRASH
2022-08-18 22:00:19 +01:00
ContrabangandGitHub 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
QwertytofortyandGitHub 432985b545 a cutting edge fix (#18849) 2022-08-17 22:33:01 +01:00
5c110b9745 uplink updates (#18800)
* uplink updates

* gives admin radio uplink 500 TC

* removing implicit var/

* fixing multiple uplink reference

* Update code/datums/uplink_item.dm

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

* Update code/datums/uplink_item.dm

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

* allowing admin uplink to buy hijack items without hijack objective

* i hate this file being in repo

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-08-17 10:54:47 +01:00
AffectedArc07andGitHub 34ed47ae74 Refactors stack traces, tiny bit of cleanup (#18773) 2022-08-14 02:11:40 +01:00
ContrabangandGitHub ceb107860f Cleans up the universal recorder, shifts it away from verbs (#18519)
* recorder pt 1

* part 2

* consistency

* nuke that verb

* ruined comment

* fixes update_icon pt1

* update_icon_state()

* fix, address sirryan and moxian

* oops that should be 600 to function properly

* aaaa spacing

* Sirryan Review

* HAL review

* Hal review
2022-08-08 00:11:33 +01:00
S34NandGitHub 901b07ef95 why (#18709) 2022-08-04 10:48:38 +01: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
S34NandGitHub 964eeea4e9 3/4 perspective donut boxes (#18635)
* 3/4 donuts that are just as filling

* donert
2022-08-03 23:53:55 +01:00
CharlieandGitHub 5a09895489 reverts #18618, fixing the melee attack chain (#18687)
* reverts #18618

* refixes the chainsaw
2022-08-03 23:33:36 +01:00
EdanandGitHub 1d552ab0e4 Armour Refactor (#18547)
* initial commit

* bullet fix + 100% armour pen

* equivalent armour values

* percentage armour pen

* updates bombing

* adds more defines

* i like armour too much

* review pass 1

* review pass 2

* updates with lavaland elites

* armour penetration value tweaks

* wt550 AP round change
2022-08-01 20:23:49 +01:00
S34NandGitHub 49e86ec4f6 Rebalances stunprods (#18640)
* zap

* BELT SLOT

* world's worst codersprite
2022-07-31 21:49:47 +01:00
daca998981 [TM READY] Ports lavaland elites from TG. (#18448)
* startup, expect like 50 unneeded icons, not bug free™️

* Hope works. Cloak works. Buffs for AI controlled. Faction fix.

* map speed buffs, fixes resummon health decay

* Adds roles. Adds Mirror walk. Nerfs revival, especialy for non antag summoned.

* I am denser than bluespace ore

* x2 antag cooldown, update desc for cloak

* removes 66% burn damage resist from elites

* honestly just knock that down

* herald not speaking right, fuckup with max hp fix

* Thanks hal!

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

* changes, changes, and more changes, oh my!

* Update code/datums/status_effects/buffs.dm

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

* GC stuff

* oh, and just one more thing

* no gibtonite gaming

* Huston we have a FUCKING PROBLEM

* oopsy doopsy

* but just one more thing (again, gc stuff)

* Lets all elites speak their mind

* NO LAVA

* grab ghost, legion charge red.

* dust the dusting from the code

* no mirror cargo shuttle crossing

* need to stop making small changes, x2 broodmother

* herald no longer crashes the MC

* Lower broodmother cooldown, herald down 5 brute and , legionare gets more smoke and thermals, pandora gets chasers

* remove extra brackets, x 2 on aoe squares

* pandora now respects factions

* fixes teleporting to tumor if reactivated by someone else. Herald has light, boost elites make message

* requested changes

* mirroring a wanted change

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-07-30 20:22:28 +01:00
66a0369166 [TGUI] Labor Camp Points Manager (#18505)
* make changes do good

* implements requested changes

* Apply suggestions from code review

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

* Abstracts checks

* guh

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-07-29 08:46:57 +02:00
AdrerGitHubadrermail@gmail.com <adrermail@gmail.com>
aaa6202a1a Changes energized fireaxe weaken to knockdown (#18543)
* Changes energized fireaxe weaken to knockdown

* Changes charge time and damage

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2022-07-27 21:26:47 +01:00