Commit Graph

2806 Commits

Author SHA1 Message Date
warriorstar-orion
dfacf83e18 Ports deer to basic mobs and adds some behaviors (#29270)
* ports deer to basic mobs and adds some behaviors

* update updatepaths script number

* whitespace

* Apply suggestions from code review

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-05-13 06:23:30 +00:00
Inferno1882
a4f701aad2 Update watercloset.dm (#29172)
Small tweaks

Signed-off-by: Inferno1882 <129122173+Inferno1882@users.noreply.github.com>
2025-05-13 04:41:40 +00:00
Osetrokarasek
9f6ff3a204 Fire-safety and Emergency Closets' Contents Tweak (#29223)
* bleh

+ added crowbars into fireclosets
+ wall emergency locker's contents now match the contents of the common one

* Update code/game/objects/structures/crates_lockers/walllocker.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>

* Update code/game/objects/structures/crates_lockers/walllocker.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>

---------

Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2025-05-13 04:07:48 +00:00
YoureNotTheSharpest
b4bdb66029 Adds Firefighting Foam extinguishers, this time hopefully wont be accidentally closing (#28791)
* Adds an atmospherics specific fire extinguisher that sprays firefighting foam!
Adds a firefighting foam tank to all the maps that refils the fire extinguisher added!

* allowed fff to enter regular extinguishers

* changed the FFF to have an F on it rather than an image of smoke

* should fix the conflicting object.dmi issues

* adds orderable firefighting foam tank crate

* makes farragus playable (literally)

* removes redundant if statement

* changes from max_water to reagent_capacity and reagent_id
2025-05-10 20:16:47 +00:00
kyunkyunkyun
ec6a23eec5 Make multitile airlocks/poddoors directional (#28928)
* Update multitile airlocks

* Update shuttle_rotate.dm

* updatepaths

* code review changes + linters

* i failed my own linters

* updatepaths
2025-05-04 02:35:33 +00:00
warriorstar-orion
30d511c5d9 admin log surplus crate purchases and contents (#29144) 2025-04-28 16:12:38 +00:00
kyunkyunkyun
e48f4ddbf3 Make sinks/toilets/showers directional for mapping (#28940)
* update watercloset.dm (again)

* add missing returns and armor check

* updatepaths

* maybe now

* try this

* should be better

* paths

* sleep doesn't work

* is it better

* he slips xdd

* this

* come on

* ok i can't beat the grab
2025-04-26 18:06:38 +00:00
Migratingcocofruit
d6a1084cfc Chair rotation fix (#29018)
* Makes pushing mobs not revert direction changes from other sources if they happen at the same time

* Update chairs.dm

* remove signal handler
2025-04-21 22:34:45 +00:00
Migratingcocofruit
cfbb9f4a1f Turbine Rework (#28524)
* it doesn't work at all yet

* Update turbine.dm

* Adds throtle control

* Update tgui.bundle.js

* Update turbine.dm

* more changes

* Adds bearing damage and failure

* a couple missed undefs

* Adds compressor grinding

* Adds requested signs to the turbine area

* Fixes button positioning

* Adjust friction from bearing damage and make the compressor always lose energy to friction

* Update tgui.bundle.js

* Update tgui.bundle.js

* Update tgui.bundle.js

* Update tgui.bundle.js

* Update tgui.bundle.js

* Update tgui.bundle.js

* Update tgui.bundle.js

* resolve conflict

* Put the turbine signs back in

* Display A message on the console when bearings are broken

* UI improvements and a small tweak to the temperature for thermal efficiency

* Thermodynamics fix

* more bearing damage

* more adjustments

* Update tgui.bundle.js

* Update turbine.dm

* Update turbine.dm

* adjustments

* More adjustments

* Fixes turbine building and changes thermal efficiency from bearing scaling

* Replaces outlet vents with scrubbers and extends faragus outlet chamber by a tile

* turbine building fix

* Add post burn temp to the UI

* Update tgui.bundle.js

* Fix to broken checking and more balance stuff

* Update turbine.dm

* Changes the scrubbers and pumps on the turbine to be off by default

* Fixes turbine not updating ui when broken/offline, as well as not heating up from friction

* review changes
2025-04-20 22:26:34 +00:00
Kyani
d2c761821a Lavaland weather types: Dying is Fun edition (#28600)
* ddsadsa

ddsadsa

* beginning

* more progress

* oops saved

* radar workin now

* bugfixing and tweaks

* working on volcano

* tweaking

* ill figure this out later

* testing still

* MORE testing

* gunna cry

* PROGRESS!!!

* volcano DONE

* starting the acid rain

* acid rain code complete

* starting windstorm

* more bugfixing...

* its finished! need to bugtest

* bugfixing

* bugfixing

* forgot prob values

* spacing fix for linter

* linter fix

* undefining things

* Update code/datums/weather/weather_types/lavaland_weather.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/datums/weather/weather_types/lavaland_weather.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/machinery/radar.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/datums/weather/weather_types/lavaland_weather.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/machinery/radar.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/machinery/radar.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* misc fixes/changes

* updated the doppler tower

* small tweaks

* still trying to get pods to work

* better support for sound transition to newly placed shelters

* minor fixes

* this didnt take oops

* nudged the probabilities

* deconflicting

* Update code/datums/weather/weather_types/lavaland_weather.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/machinery/radar.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/machinery/radar.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/machinery/radar.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* applied requested fixes

* master update

* updates

* this should be here

* Apply suggestions from code review

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* requested fixes

* sound tweaks

* remove debug message

* turned down ash storm sound

* fix gulag weather and attempt to fix sound overlap

* blackbox weather and title-case ash storms

* change up probabilities and bump acid rain melt chance

* another title case

* starting on issues

* revert some changes

* tiny tweak

* reworked acid rain a bit

* small tweaks to sleepers

* moderate again

* revert

* ups the rocks

* bug fixes

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2025-04-18 20:18:38 +00:00
kyunkyunkyun
6935d2df5d Updates pride mirror's code (#28718)
* better

* code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>

---------

Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2025-04-16 17:32:31 +00:00
warriorstar-orion
efc8adb6dd Basic mobs targeting, attacks, and pig migration. (#28987)
* Basic mobs targeting, attacks, and pig migration.

* run updatepaths

* fix duplicate macro def

* Update code/datums/ai/basic_mobs/basic_ai_behaviors/basic_attacking.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-04-15 14:45:56 +00:00
kyunkyunkyun
bf28bfd604 Updates Rocky Motel (#28786)
* this motel rocks

* nvm i got chat gpt

* relocate icon

* oh it removed web commit
2025-04-09 19:26:42 +00:00
Migratingcocofruit
4d848c7c2d Fixes window rad insulation (#28927) 2025-04-08 14:06:53 +00:00
warriorstar-orion
c820499f90 Basic mobs core implementation and cow migration. (#28667)
* Basic mobs core implementation and cow migration.

* fix whitespace

* uncomfortable fix for null weirdness

* update updatepaths script number

* lewc review 1

* fix delta

* Update code/datums/ai/basic_mobs/basic_ai_behaviors/tipped_reaction.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-04-05 11:35:42 +00:00
CRUNCH
409d33a024 Migrates Engi Cart to the New Attack Chain - Cleans up Engi Cart Code - Makes Pre-Filled Engi Cart Variant and Adds it to All Stations (#28849)
* Fine quality cart

* Addition

* Apply suggestions from code review

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-04-05 02:06:54 +00:00
Burzah
b642a271e1 Reverts Slime/IPC Imitation Cosmetics (#28695)
* Initial commit

* Removes unused define

* oops
2025-04-03 17:17:35 +00:00
kyunkyunkyun
7a72d54fec fix opened crates (#28799) 2025-04-02 08:05:44 +00:00
warriorstar-orion
ff0c749f31 refactor: add commonly used investigate category defines (#28826) 2025-03-30 23:10:48 +00:00
Contrabang
fde22d1c43 Adds more reasons to explosion logging (#28812)
* explos

* yeah good enough

* shorten that

* use ckey

* forgot this cause

* unfuck it
2025-03-28 18:49:57 +00:00
1080pCat
8ffdf1aa81 Curtains fixes and tweaks and refactors (#28594)
* Update curtains.dm

* Update curtains.dm

* extra shit

* more\

---------

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2025-03-26 10:19:32 +00:00
warriorstar-orion
fdfe552461 convert emergency lockers to directional mapping helpers (#28558)
* convert emergency lockers to directional mapping helpers

* update Updatepaths script number

* fix delta
2025-03-26 05:12:07 +00:00
kyunkyunkyun
ba46d193ad Update cardboardbox.dm (#28485) 2025-03-25 20:12:12 +00:00
warriorstar-orion
f9ade844c9 Kitchen rework part 1: machines and recipes. (#28277)
* Kitchen rework part 1: machines and recipes.

* update oldstation

* update updatepaths script number

* fix blank icon test

* remove old deep fryer completely

* fix duped recipes and recipe datum names

* add chef PDA cart to chefdrobe

* nerf grill wood consumption rate

* multiply food for cooking machine rating

* fix runtime

* add cookware to syndie base and oldstation

* remove dupe burger recipe, update syndie/oldstation setups

* nerf potency quality award

* buff burn/ignite times, remove pointless on_fire flag

* more grill woodburn nerf

* meh

* try and unfuck timing issues

* more fixes and icon updates

* more fixes

* more review changes

* fix linter

* disable pcwj debug

* fix grill and deep fryer overlays

* fix timers with no containers

* attempt to fix reagent adding issues

* more cleanups

* allow rped usage

* grammar, null checks, reagent display

* PDA updates, map updates

* fix mats values

* new panel sprites

* recipe fixes, add prep bowl

* revert unused icon file changes

* move this to mesh with smith TM

* remove food quality for now

* New sprites, autochef.

* fix examine text

* reduce oven cook times

* lots of fixes

* fix autochef recipes that start with reagents

* prevent shenanigans

* megapatch 1

* block ingredients behind oven door

* PDA app improvements

* remove unused proc

* fixes for cookbook, descontructions, completed steps

* allow empty containers with a tracker to be claimed

* allow reclaiming

* autochef reliability fixes

* autochef reliability fixes

* fix quality product count

* update updatepaths script

* better stack handling

* more fixes for stacks and reagents

* timers no longer turn off burners automatically

* autochef turn offs and make sure we can see output storage

* add microwave recipe for roundremoving player brains

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* burza review 1

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* fix berry muffin name while i'm here

* grill -> microwave in new tests

* grill -> microwave in new tests, but actually for realsies

* i definitely know what i'm doing

* redundant attack chain setting

* add examine text about clearing buffer

* remove unused vars and start improving docs

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-03-23 04:59:08 +00:00
CRUNCH
214acd3ed5 Standardizes All Janitorial Closet Equipment Across Every Station (#28563)
* Janicart code

* mapping stuff

* e

* Update metastation.dmm

* wags-his-tail

* Update metastation.dmm
2025-03-20 14:25:10 +00:00
ExusA
a1ff715bf1 Adds a bunch of buildable wood stuff, resprites planks (#28528)
* New wooden furniture

* Bonfire repath

* Wood retexture

* Wood Resprite

* Fixes

* Description fix

* Fixes

* Undo match changes

* Undo match icon changes

* Typepath script

* rackable spears

* bounding box adjustment

* Spear Rack

* Memorial tweaks

* Apply suggestions from code review

Co-authored-by: Toastical <vnndvp@gmail.com>
Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com>

* More memorial tweaks

---------

Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com>
Co-authored-by: Toastical <toastical@toaster.com>
Co-authored-by: Toastical <vnndvp@gmail.com>
2025-03-16 18:02:40 +00:00
PollardTheDragon
cd7cb01a1f Meet the Smith - New Supply Role (#28273)
* Smith role, access, access helpers, spawn point, comms, and IDs

* Area defines

* Hammertime

* Cyberiad Smith's office

* Forgot some atmos stuff

* Autolathable Hammers

* Formatting

* Toolbelts can hold hammers

* Initial work on smith machines

* Farragus Smith Office

* Placeholder sprites, mapping

* Smart hopper points and console messages

* More work on smithing machines

* Fixed mapping, added qualities, added smithed items, fixed sizing, fixed access

* Smith components, new materials

* New ores, material datums, furnace, power hammer, kinetic assembler, hammer act, item creation

* Missed one

* Grrr map conflicts begone

* Dirt begone

* Casts and smelting

* Linters

* Attack chain linters!

* Better grip to throw people into your industrial machines

* Placeholder spots in the DMIs

* UpdatePaths - Space ruins now spawn new space ores in their rocks

* Small changes - removed excess tgui code from hopper

* Fixed a button on emerald

* Attaching inserts and lenses. Tool bits are pain.

* Tool bit initial implementation

* Merge conflict resolution

* Attack chain grrr

* Fixed a pair of minor mapping issues

* Tool bit implementation, efficiency, failure rate

* Hot things burn hands

* Points fix on hopper

* New mining rocks for space exploration

* Areas on asteroids

* Machinery icons 1

Adds basic icons for the new machinery

* Vendor iconstate update

* Crucible touchups

* Hammer touchups

* Crucible Input Animation

Adds an animation when you deposit ores

* Added scanning the crucible with multitool to get mineral count

* clothing sprites part 1

* locker sprite

* job icons

* garment bag

* Smith locker mapping

* Insert and Bit removal fix

* Job menu alignment fix, Allowed_items and small spriting path fixes

* Adds new asteroid ruins to config

* Ore Sprites

* Hammer Sprite

* Item Sprites 1

* Sheets, Wall Ores and Trim

* Sheet iconstate names

* species uniforms

* Tabs

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

* Lens spelling fix

* Signalizes attaching and detaching modifications, fixes inserting items into smith machines, fixes cast bugs

* Fixed type lists

* Smithing machine bug fixes.

* Fixed adding modifications to items

* Crucible Lava Idle

Adds an idle animation for the crucible, but it needs overlay code to work.

* Fixed eguns

* Magma Crucible overlays and animations

* Machine broken/Off states

Adds broken, wires exposed (and on/off where appropriate) states to machines.

* Castivend recolor and Hot Items

* Overlays for all machines, new sprites for hot items, new checks, fixes

* Woe, farragus merge conflict

* update_appearance linters

* I have fat fingers.

* Forgot one

* transfer_item_to and qdel null check

* Usr to User

* Modsuits should not have inserts.

* Adds casting lip overlay

* Balance pass on movement debuffs and buffs

* Material movespeed changes

* Config Adjustments - USED FOR TESTMERGING. REVERT BEFORE FULL MERGE

* Math fixes for lenses and bits.

* Mobility suit no longer speeds you up, but negates suit-based slowdown like an oil slick potion. Fixed movement mods in material datums

* Bad var. Bad.

* Various fixes to bugs revealed in initial TM

* TYPO

* Lavaland base turf fix

* Paths in examine fix

* Adds an intercom to the workshop.

* Stamina-hybrid damage oversight fix for det revolver, uion, etc.

* Currently Operating Message fix

* Allows glass to show different turfs beneath. Adds plasmaglass section to workshop.

* Armor and upgrade fixes

* RCD tool bit equip fix

* Adds smith access to a few lists in access.dm that were missed in an oversight

* Indent fixes

* Fixes vending machine, allows tool bit use on mining equipment

* CI, you make me mad sometimes

* Removed duplicate code

* Name fix for CI again

* ORM now can handle space ores

* Adds space ores to Vetus drop and to trader inventories

* Fixes runtime with open hand attacking a lava furnace with nothing in it

* Adds crewvend kit to Castivend

* Fixes not being able to see new ores

* Adds drill and RCS to smith locker

* Map changes. Added cargo pad. Expanded catwalk. Moved vendors. Added recharger.

* Plant fixes

* Fixes doubled-up catwalk

* Emerald cargo windoor fix, small lavaland adjustment

* Small oversight for overlay fix

* Missing lightswitches

* Fixed stock parts mismatch in casting basin recipe

* Better support for power tools, grrr attackchain

* Better attack chain handling. Better handling for bit insertion

* Fixes handling of inserts with storage suits (like labcoats)

* sprites for bomber + plasmeme outfit

* Adds missing adjacency checks

* Buffs speed boost from upgrade - max upgrade reduces cycle to 2 seconds.

* Fixed floating lights, brightened the explorer's new room, expanded smith workshop slightly.

* Small hallway adjustment

* Illuminates metastation smith office

* Removes excessive decimals in magma crucible scan output

* Berserker should not have inserts.

* Buffs bit durability significantly, nerfs amplifier lens and densifier lense slightly

* Adds smith bomber jacket to loadout panel

* Adds random spawners for smithed items, adds random low-quality items to maints loot

* Adds traitor version of bulldog shotgun

* Revert "Adds traitor version of bulldog shotgun"

This reverts commit 1d39c59f07.

* Added check to assembler, moved desc changes to examine()

* plasmaman suit fix

* Fixed hot check when removing items from hammer and furnace

* Remaps lavaland workshop, fixed deltastation light switch

* Improper's the smith office name

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Compacts extra ore drops from Vetus

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* better looping

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Better loop

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Multitools don't need tool bits.

* Better variable names, fixed missing parenthesis

* Recursive hammering, removed attack animations when inserting items or using multitool on smithing machines

* window

* Update deltastation.dmm

* Update deltastation.dmm

* Update deltastation.dmm

* Fixes small oversights

* Minor lavaland remap

* Reverts TM-required changes in preparation for full merge

* Begone, stray font!

* Damn you cable CI

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: ExusA <67055922+ExusA@users.noreply.github.com>
Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-03-15 21:35:21 +00:00
Vi3trice
961664b564 Skipping its chain and leaving it in the cart (#28642) 2025-03-12 15:14:47 +00:00
Toastical
f7dfa9827b shower fix (#28539)
Co-authored-by: Toastical <toastical@toaster.com>
2025-03-09 02:16:54 +00:00
Mira
a6e8f69c55 [PORT] Adds TG "busy" cogbar animation for players (#27932)
* looks like it works

* move to PREFTOGGLE_3 and add sneaky do_after

* linter

* param doc and some cleanup

* autodoc and comment signal

* fix wrong type in link_processing

* fix wrong var in preferences

* cover do_mob and do_after_once

* fix toggles total

* replace indent with space

* offset and helpers procs

* fix conditional statement

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/__HELPERS/mob_helpers.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* use SECONDS

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

---------

Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-03-06 16:04:51 +00:00
warriorstar-orion
5b3942da10 remove unused variable (#28589) 2025-03-05 21:00:22 +00:00
Migratingcocofruit
ebf7fdbfd2 Radiation Rework (#28320)
* initial changes

* Rad wave is working. now to implement the rest

* Makes the waves square

* Makes wave square

* multiplies the strength in all instances of radiation_pulse by 4 because each pulse makes one wave instead of 4 now

* Undef thing and apply suggestion

* Make radiation_pulse() not radiate the radiation source and implements contamination

* Adds contamination to uranium walls and meteors

* Fixes stuff

* Handle some contamination on attack still need to take care of meteors

* Fixed the meteor stuff

* Introduce emission types

* moves contaminate_touch to an atom proc and renames it to contaminate_atom

* deduplicates some contamination code

* Move inherent radioactivity to a component and signals from the atom vars and behaviour

* fix some things with the new component

* Update inherent_radioactivity.dm

* implement contaminating things that hit things that are inherently radioactive

* window things

* adds emission type to the rad_act call

* Changes radiation insulation values on a bunch of stuff

* fixes radioactive component radiating the wrong type

* more adjustments

* refactros rad_act

* adjustments to collector power production

* Adds plastitaniumglass windows and makes further adjustments

* Adds sprites to the shards and plastitanium directional window

* Update misc_cleanables.dm

* removes alpha rad insulation from floor turfs

* Fixes a bug with the starting tile of radiation waves

* More adjustments

* Adjusting singularity rad production

* reduces window half life a bit to make power smoother and buffs full window rad conversion

* Strengthens gamma and beta radiation effect on mobs.

* Makes radsuit block radiation completely

* Fixes Geiger Counters

* Fixes contamination not irradiating the contaminated thing

* Fixes inherent radioactivity not processing. Also makes it stop processing when a nuke core is contained

* Fixes ghost contamination

* Adds info to the collector

* Handles alpha radiation better on humans and changes some instances of rad_act to base_rad_act

* oops

* adjustments and fixes to alpha rad handling on mobs

* Make collector info more compact

* Core no longer radiates and contaminates from within the nuke until the plates are removed

* Contamination no longer counts as being inside a mob(it is supposed to be surface level)

* Adds inherent radioactivity to a bunch of uranium things. makes it all process.

* Nerf full windows

* Adjustments to collector and fulltile window radiation absorption

* Reduces passive contamination, especially while on the floor

* Adds different rad types to the geiger counter and fixes a runtime

* Makes full tile windows strong again and disallows building them on top of collectors

* adds emissive blockers to the rad blacklist and gives windows and collectors priority when irradiating for increased consistency

* Gives each contamination type it's own color.

* Gives each contamination type it's own color.  And makes the rad hud display them separately

* Changes how much the radiation wave affects the source tile, adds decay for performance reasons and adjusts collector parameters as well as SM and singulo rad production

* improves performance at very high rad amounts

* Fixes supermatter sliver box not containing radiation

* Restores supermatter sliver to old behaviour(not inherently radioactive)

* Slight nerf to fulltile windows and removes an unnecessary multiplication from rad wave processing

* Removes redundant line from window rad act

* Fixes radiation waves ignoring walls

* fixes it better

* more adjustments to collector stats

* Adjustment to collector gamma absorption

* increases grille beta blocking

* Review changes
2025-03-02 20:34:45 +00:00
PopeDaveThe3th
bd132853f6 boolet (#28445) 2025-03-01 03:31:15 +00:00
warriorstar-orion
ab073f0cca make detective closet contents consistent across stations (#28511) 2025-02-28 17:52:33 +00:00
Tojo
0d968d7803 Reworks Curtains (#28163)
* Reworks Curtains

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

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* New Overlay Code

* THE BEGINNING OF HELL

* Interact with Atom on mountable

* Fixes return, looks mergable.

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update Overlays Refactor

---------

Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-02-26 09:58:51 +00:00
CRUNCH
39142470e8 Mop, Mop Bucket, and Janicart Refactor (#28049)
* Update mop.dm

* This... Is a bucket

* Dear god...

* Update janicart.dm

* There's more

* No!

* Finished?

* newline

* Update janicart.dm

* Update mop.dm

* Update mop.dm

* Update mop.dm
2025-02-18 11:13:05 +00:00
Charlie Nolan
194e851b8f SSair performance improvements (#28271) 2025-02-12 22:39:09 +00:00
Vi3trice
baad3135c9 I question some people (#28208) 2025-02-12 13:19:06 +00:00
PopeDaveThe3th
3ace66e481 [LORE] Replaces all uses of the word "intergalactic" in code (#28203)
* begone

* Update SSshuttles.dm

* Update mail.dm
2025-02-10 03:02:09 +00:00
Spaghetti-bit
32c9d4d682 Slime People and IPC; Imitating Species Cosmetically. (#27359)
* Pain

* More transparency / alpha

* Vulp + Name override

* more transparency alpha stuff

* Reworks species subtype for slimepeople

* Iteration 3...

* Me when initial

* 60 - 61

* Character.dm select query changes.

* 61-62

* The real 61-62

* Update to IPC imitation

* +63-64.sql
> species_subtype after pda_ringtone

IPC identity configuration surgery.

Slime "Morph" action: 10 seconds. Allows a slime person to change how they look.
> Same cost as regenerating a limb.

Link processing subspecies implement.

* Pain2

* SQL

* Frankenstein monster fix

* Slimify! ...no longer applies to robotic limbs.

* 220 Alpha to 200

* Ordering issue fix.

* Last ordering issue.

* aa review, paradise_schema.sql

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2025-02-09 15:59:57 +00:00
Contrabang
3ac3fe2157 bongo (#28263) 2025-02-05 20:13:31 +00:00
Mira
fe53f56d8b Fix standing corpse when unbuckling it from a meat spike (#28037)
* fix lying angle

* it's not even necessary
2025-01-31 20:56:10 +00:00
ExusA
22865d67f6 Potted plants size categories (#28046)
* Updated potted plants

* Proper randomization and reorganization

* Update Kirbyplants on maps

* Remove redundant icon_state

* Revert "Remove redundant icon_state"

This reverts commit bf51470687.

* Update icon-state for generic kirbyplants

* Fix Initialize argument

* Typo fix

* Typo fix 2

* Typo fix 3

* Update plants.dmi

* Add typepath update script

* Add hiding to medium plants and hiding feedback

* add names indicating size

* add 2 more medium plants to medium

* typo fix
2025-01-31 15:52:30 +00:00
Tojo
0249a8dc96 Office Chair Overlapping Tweak + Slightly better layer logic for chairs (1 line lol) (#27844)
* Add Office Chair to the Armrest system, tiny refactor of armrest system.

* Implicit armrest null from DrSmail

Co-authored-by: Drsmail <60036448+Drsmail@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Yeah so I impulsively ported the entirety of this system without knowing what it did

* Revert "Yeah so I impulsively ported the entirety of this system without knowing what it did"

This reverts commit d4edb72a3b.

---------

Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>
Co-authored-by: Drsmail <60036448+Drsmail@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-01-28 20:49:12 +00:00
warriorstar-orion
f479ace54f Attack chain migration: /obj/machinery (#27784)
* one at a time let's go

* air alarm

* so many

* meh

* hell

* hell

* hmm

* Attack chain migration: /obj/machinery

* what the fuck?

* hell

* review fixes

* whoops

* fix build

* nuke fixes, more tests

* gland dispsenser and start of autolathe test

* var renames

* small fixes

* i tire of life

* more tests

* more tests

* more tests

* shrink map

* customize autolathe design disk load delay

* cell charger

* fire alarm frame installation test

* funny and burz reviews

* nuke fixes
2025-01-26 00:23:42 +00:00
Paul
ad4e5a66f7 [PTBF] Hallucination: The Backrooms (#27710)
* add backrooms hallucination

* mapmerge

* fix some backrooms issues and add some error handling stuff

* change backrooms carpet

* remove code that isn't doing anything

* tick new backrooms file

* try a new method with movement

* don't smooth corners

* fix red carpet hiding under backrooms carpet

* fix multiple turfs

* accidentally removed important code tracking items, oops

* implement new solution to the backrooms clone thing

* hmm so that's what the icon does

* indentation machine broke

* remove the tucked away spawn locations

* add comment for follow_movement

* revert oversight (the bar can keep its bevvies)

* put the thing back in that I wasn't supposed to remove

* Update code/modules/hallucinations/effects/backrooms.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Paul <90473506+pwbokie@users.noreply.github.com>

* Update code/modules/hallucinations/effects/backrooms.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Paul <90473506+pwbokie@users.noreply.github.com>

* fix missing comma

* code improvement tweaks from DLG

* add a fade out and in

---------

Signed-off-by: Paul <90473506+pwbokie@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-01-25 13:27:39 +00:00
Paul
0a08b79552 add slime people to the magic mirror (#28027) 2025-01-25 00:05:53 +00:00
Bm0n
72a06a1d8c Gives full tile R-Windows and Plasma R-Windows and Plastitanium heavy rad protection, nerfs smaller dir based windows. (#27898)
* the change

* few more changes

* desc update

---------

Co-authored-by: Bmon <no@email.com>
2025-01-24 23:52:53 +00:00
PopeDaveThe3th
4bdd8a06ba [LORE] Bluespace Lore Pass Pt. 1 (#27809)
* when the space is blue

* Update bio_chip_fluff.dm

* Update wormhole_jaunter.dm

* Update magazines.dm

* Update bags.dm

* Update magazines.dm

* Update dance_machine.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update closets.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
2025-01-23 05:21:16 +00:00
warriorstar-orion
157276d6cb Port /tg/ move manager, drift and jetpack components. (#27698)
* Port /tg/ move manager, drift and jetpack components.

* don't add go through newtonian movement if not moved to a turf

* various cleans for blood drifts and mob speed

* fix slow meteors

* why on fuck's earth aren't speedbikes vehicles

* style lint

* also wtf

* okay i'm an idiot

* fix meaty ore speed and blood decal double stepping

* fix not unbuckling pulled object occupants

* don't bother dealing with immovable rods just yet

* exclude bubblegum and vetus from move manager for now

* fix issues related to null weightless blood icons

* reset blood icon state properly

* fuck it, we'll deal with mobs when basic mobs happen

* break infinite loop in decal splat
2025-01-22 22:49:58 +00:00