Commit Graph

610 Commits

Author SHA1 Message Date
Vi3trice
a5ecf3bce5 Catwalk floors for interior use (#21437)
* That's a start

* We had sounds all this time

* New icons, fix tile interaction with plating.
2023-07-07 13:50:17 +01:00
DGamerL
173bfb92f5 Removes bio resist from the code (#21108)
* BIO armor is kill

* some more stuff that uses bio resist

* I did a scuffed merge conflict solve but it works
2023-06-03 09:50:22 +01:00
datlo
cf07639da3 Tweak kitchen spikes (#21152)
* Tweak kitchen spike

* fix deconstruction

* fix mistake lmao

* revert wrench_act and fix metal drop

* fix accidental removal

* and the damn end of line

* AAAA

* add mob check to victim, deconstructing tweak

* fix bug preventing attack on spikes
2023-06-02 19:12:02 +01:00
Englishformula
a5d5086819 Alien Alloy Sprite Fix (#21103)
* Update mineral.dm

* Update mineral.dm
2023-06-02 18:07:24 +01:00
Silverplate
19af733ad2 Medical stacks (#20824)
* Fixes gauze upgrading

* Fixes accidental line removal

* Unessassary boolean

* shortens code, adds flag to /stack/medical

* Clarity and proper inhertance
2023-04-25 16:00:37 -05:00
Henri215
6826d2ba7b Moving some in hand icons to different files (#20748)
* Moving some icons out of left/righthand.dmi

* Moving sheets and ores
2023-04-25 21:13:02 +02:00
Henri215
dc75a748f1 Fixing common spelling mistakes part 3 (#20870)
* Fixing common spelling mistakes part 3

* collectable

* another collectable

* part 3.2

* "</span>."

* A bunch more fixes
2023-04-22 09:44:27 +02:00
Contrabang
b47f22ffb9 Fixes a runtime with cyborg stacks being initialized with no power source (#20848)
* begone runtime

* refactor
2023-04-22 09:43:51 +02:00
S34N
8d8f488f2d fixes this (#20745) 2023-04-16 22:13:35 +02:00
Charlie
e6085895c1 burn wounds, for real this time (#20542)
* burn wounds

* user feedback

* ready for review

* sean review

* Apply suggestions from code review

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

* surgery fix

* other repair methods

* GDN review

* health scanner feedback

* Update code/game/objects/items/devices/scanners.dm

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

* bodyscanner print out

* Update code/game/machinery/adv_med.dm

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
2023-04-14 15:58:38 +02:00
S34N
c8418fa1b2 sinew (#20718) 2023-03-26 13:59:53 +01:00
S34N
a65706a368 Fixes missing stacks, wonky ORM icons (#20717)
* oh god why

* lol TGUI rebuild
2023-03-26 13:16:21 +01:00
S34N
5ce5a66c81 Ports a load of Pigeonverde322 sprites from beestation (#20588)
* initial

* second

* MORE

* spelling

* more spelling, rods

* qwik mafs
2023-03-26 12:11:01 +01:00
GDN
5557f6ae32 Nukes detailed examine (#20314)
* Nukes detailed examine, converts to normal examine stuff

* THE SHOOTENING

* Update code/game/objects/structures/grille.dm

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>

* oop

* Update code/modules/mob/living/silicon/robot/drone/maint_drone.dm

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

* Update code/modules/power/apc/apc.dm

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

* Update code/modules/projectiles/guns/energy/nuclear.dm

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

* bam

---------

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-03-17 16:20:53 -05:00
AffectedArc07
b34e8fa301 [READY] CI now bans files with the same name (#20195)
* CI now bans files with the same name

* Part 1

* Warriorstar python tweaks

* Part Deux

* Fix unticked

* fix
2023-02-04 16:33:41 -06:00
Adri
579fd817c1 Adds disco light floor (#20109)
* Adds disco light floor

* Fixes tiles not stacking

* Fixes linter issue

* Update code/game/turfs/simulated/floor/light_floor.dm

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

* Update code/game/turfs/simulated/floor/light_floor.dm

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

* Update code/__HELPERS/lists.dm

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

* Replaces shitcode with simple solutions

* Update code/game/turfs/simulated/floor/light_floor.dm

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

* pick excluding

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

* pick instead of rand

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

* Simplifies the color change process

* forgor setting current_color

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

* proper autodoc format

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-01-18 21:39:46 -06:00
Henri215
ad608cf016 Fix #20076 Plasmaglass and plasmarglass now returns the correct amount of materials (#20079)
* Plasmaglass and Plasmarglass now returns the correct amount of materials

* forgot alien alloy
2023-01-03 15:48:58 -05:00
Qwertytoforty
1c05e8aa5e Mining borgs now have melee armor. (#19986)
* Mining borgs now have melee armor.

* oh, and one more thing

* Apply suggestions from code review

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

* siryan code review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2023-01-03 01:04:39 -05:00
warriorstar-orion
066bd06e8d Whitespace cleanup part 3. (#19897)
* Whitespace cleanup part 3.

* clean up mecha a lot, other review fixes
2022-12-27 11:00:39 -05:00
Henri215
ab8217f012 Mineral doors now takes 2 seconds to build (#19992) 2022-12-24 11:05:24 -05:00
Daylight
ebf2d2b18f Creates full stacks of all sheets and minerals (#19911)
* /fifty

* re-adds plastinium, even if the sheets themselves have no sprite

* adds glass stacks and plastitanium
2022-12-19 14:29:55 +00:00
Henri215
74a5925def A museum's finest: Statues tweaks (#19680)
* tweaks and adds to statues

* bust removed
2022-11-26 16:02:52 -05:00
S34N
4de47b8b58 Refactors table creation (#19441)
* refactors table creation

* probably works will test later

* tested and tweaked

* words are hard

* Apply suggestions from code review

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

* steel review

* proc breakout

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-11-15 15:45:55 -06:00
Henri215
eea6b82b15 Sarcophagus now can be made using sandstone (#19625)
* added sarcophagus to sandstone recipes

* 5 seconds to build
2022-11-11 14:31:58 +01:00
Contrabang
32146754c1 bye bye macro (#19574) 2022-11-02 20:52:22 +00:00
Vi3trice
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
Henri215
499a0f3b9d Moved wood floor (#19487) 2022-10-25 20:35:28 +02:00
DevanStrife
bb2e2a9d45 Allows wooden airlocks to be made and removes another text2path function. (#19199)
* Fixes #18882 and refactors for door assemblies

* Removes text2path, makes wooden airlocks buildable

* Use mineral crafting menu

* Minor oversight

* Comments improvement

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

* Review suggestions

* Removes unneeded vars

* Fixed tab spacing

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-16 13:04:50 -05:00
Henri215
70762ba7e0 Adds briefcase/card box as leather recipes and reorganizes other recipes (#19342)
* adds briefcase and card box to leather and reorganizes recipes

* standardized the coded and removed unnecessary  \

* seconds
2022-10-16 13:47:33 +02:00
Vi3trice
59dfdba201 Everything else through the door (#19358) 2022-10-13 21:56:58 +02:00
Vi3trice
9e90c81282 Defining Part 1 - Code cleanup toward defines (#19262)
* This is only the beginning

* Update stack.dm
2022-10-10 20:50:29 +02:00
Henri215
3d2092885f Bronze/Glass ashtray now can be made (#19056)
* ashtray crafting

* added timers
2022-09-17 10:51:02 +01: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
AffectedArc07
2da68e9b64 Atmospherics refactor (#18460)
* Atmospherics refactor

* META(GAMING)

* Cleanup

* RPD hotfix

* Fox review

* Do this

* Well that escalated

* Repath these

* Ah yes, scope creep

* Remove this comment

* Regression #1
2022-08-01 16:27:35 -04:00
Vi3trice
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
dragonpan2
1dc0669e12 expanded plastic crafting (#18281) 2022-07-15 20:32:48 -05:00
S34N
10d0e2f230 New benches, colourable sofas (#17985)
* new benches, colourable sofas, directional beds

* removes bench corners

* slight sprite tweak

* inverse corners!

* removes rotatable beds due to mob jank and bedsheets

* fixes that one freaking always wrong cyberiad sofa

* make things use the in-built spraycan menu
2022-06-20 21:00:12 +01:00
Kugamo
d4d4615fe2 Inhand sprites for metal sheets and ores (#17952)
* amogus

* Revert "amogus"

This reverts commit ebaa99c77b.

* okay

* fix merge conflict
2022-06-14 13:34:08 +01:00
13spacemen
b2a57c7637 changed the green medbay airlocks to blue ones (#17827)
green ones are now a new subtype virology airlocks
added viro airlocks to RCD, metal recipes, airlock painter
2022-06-09 12:32:03 +01:00
moxian
05c431b66a Allow construction of grilles on lattices (#17906) 2022-06-06 21:52:59 +01:00
Mitchs98
fa3997bb42 Adds Chess Pieces (#17587)
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
2022-05-16 22:25:21 +09:00
atteria
bcf90593ed Improves belt item overlay code, Adds new belt item overlay sprites (#17568)
* belt-improvements-and-sprites

* fixes my fix of botany belt allowed contents
2022-04-12 15:57:21 +01:00
Charlie
e979201a57 Removes tribbles (#17524)
* removes tribbles

* forgot this

* styling
2022-03-28 09:57:10 +01:00
Akira Akashi
91b4a93663 make sure improvised gauze doesn't actually heal brute (#17381) 2022-01-31 09:15:14 +01:00
AffectedArc07
2781d3ffaa Fixes my idiocy (#17183) 2021-12-02 14:43:22 +01:00
AffectedArc07
1dec9a0cb9 Adds a warning message for admins for an exploit (#17182) 2021-12-02 12:37:26 +01:00
datlo
f92f20c74c Fix cult structure stacking exploit (#17091) 2021-11-13 16:15:24 +01:00
E-MonaRhg
ac68ea59df Carpet and table stuff 2021-11-05 19:46:42 +02:00
Luc
b527838507 Fix abductor closet cloning mats (#16985)
* Update abductor closet to only drop one alloy

* Revert, make it just cost two alloy to make
2021-11-02 22:07:46 -06:00