Commit Graph

185 Commits

Author SHA1 Message Date
Chap 429bebc613 [FIX] Animated closet fixes (#27102)
* Some animated closet fixes

* Trailing newline

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2024-10-15 01:09:04 +00:00
Chap b51cc0f31c [PORT/FEATURE] Animated closet doors (#26832)
* Adds animated closets

* Remove unecessary icon states and fixes secure closets

* Actually fixes secure closets

* Please our linting overlords.

* Fixes non-crate subtypes

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

* Moved legacy closet icons to seperate file

* Remove some unused variables

* GC

* Moved to proper destroy

* It's good when code compiles

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-10-14 14:05:16 +00:00
warriorstar-orion 9a5db8f91e refactor: remove CanPass height arg (#26700) 2024-09-11 14:49:30 +00:00
Spaghetti-bit 3fd78491e6 Moving while buckled or while in a locker that is locked / welded will no longer reset resist timer. (#26523)
* Moving while buckled to a surface will no longer reset the timer / cause you to fail.

* Properly applies the same principal to closets and secure lockers.

* Changes break out time to use the MINUTES define.

* Apply suggestions from code review

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

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-08-24 16:43:47 +00:00
DGamerL 44671e31e8 Adds: The C-Foam launcher (#25738)
* The start

* Getting a bit further

* Slight ammo casing update

* Istype helper and foam blockage

* Adds status effect

* Foam blockage and status effect fixes

* Autolathe ammo + stun

* aaaaaaaa

* Adds uplink item

* Actual slowdown

* Makes attacking a bit faster again

* Ammo increase to 12

* Sirryan review

* Adds sprites - almost working

* Lots of fixes + mineral doors

* Mineral doors don't open with foam
2024-08-01 06:24:09 +00:00
Сиротка ab85721b44 Few bugfixes for Shadow Demon (#25671)
* Few bugfixes for Shadow Demon

* Update shadow_demon.dm

* Update code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

---------

Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-06 20:30:49 +00:00
Qwertytoforty 2ce4c20515 Adds the Lance emergency shuttle (#24806)
* WIP: Adds the Lance emergency shuttle

* untodo

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* c-c-c-changes

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* Update code/datums/shuttles.dm

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
2024-05-15 14:13:51 +00:00
Qwertytoforty 9ae66dd496 You can no longer see hud / screen when asleep. DOESN'T AFFECT BLINDNESS (#24360)
* You can no longer see hud / screen when asleep

* oh fuck the huds

* Update code/_onclick/hud/robot_hud.dm

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

* storing when looking into a bug

* more tweaks

* Initial screen object fixes

* fix for old screen types

* animation my dear watson

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-05-05 09:42:12 +00:00
Charlie Nolan 495030f5a4 Stop crates and lockers from taking stuff they shouldn't. (#24583) 2024-03-12 12:13:00 +00:00
Contrabang 87a318a7de Refactors screen objects to /atom/movable (#24068)
* introduce helper + remove unused proc

* we love compatibility

* Update code/_onclick/hud/action_button.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/_onclick/hud/action_button.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/_onclick/hud/alert.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/_onclick/hud/blob_overmind.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/_onclick/hud/blob_overmind.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/_onclick/hud/blob_overmind.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/martial_arts/martial.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mining/lavaland/loot/tendril_loot.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/species/shadow.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/species/shadow.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/living_update_status.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/_onclick/hud/screen_objects.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/_onclick/hud/screen_objects.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/_onclick/hud/screen_objects.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/internal.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/machinery/computer/camera_advanced.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/machinery/computer/camera_advanced.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/internal.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/mecha/mecha.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* deconflict

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-03-03 17:37:51 +00:00
Daylight a13e91a29d Player-controlled simplemobs can now open lockers and morgue trays (#23543)
* Closets

* Morgue

* FIxes

* Whitespace

* AAAAA

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

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-12-31 10:40:27 +00:00
Nathan Winters 60ee7e11b7 Lets lockers/crates protect food from ants (#23286)
* Let lockers prevent ants

* Refactor ants check; exclude closed lockers and cardboard boxes from turf structure check

* Make the structure check more lenient, convert to typecache

* gnarg

* gnarg 2: Electric Boogaloo

* Minor simplification/optimization
2023-11-24 15:37:20 +00:00
Contrabang 48d7b00a0d CI now bans the use of weird spacing in conditionals (#22777)
* no more spaces

* Matthew 10:22

* fixes

* dgamerl review

* Update code/modules/hydroponics/plant_genes.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/bot/ed209bot.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/pda/PDA.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* fuck

* bah

* Update tools/ci/check_grep2.py

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* oops

* guh

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-11-12 20:59:43 +00:00
GDN 35754c77ea Verb cleanup (#22224)
* Verb cleanup

* rest of the object verbs

* little more object cleanup

* more changes

* last of it

* this too

* tgui

* code review

* time to go
2023-11-12 20:19:17 +00:00
Vi3trice 85353104f7 text be gone (#22929) 2023-10-26 10:39:11 +01:00
GDN c23fb7c910 Reverts Slowdown on pulling #21056 (#21596) 2023-09-13 11:40:53 +01:00
HMBGERDO fc3dcb1254 Laggy DragNDrop fix (#21052)
* added dragndrop click methods for atoms

* some updating, little changing MouseDrop logic

* added INVOKE_ASYNC to delayed procs

* cleanup

* cleanup

* cleanup

* no cheesing

* more comments, removed  variable from atom

* whoopsie

* added inventory screen objects support, disabling tooltips now disables all tooltips, not only items

* fixing table hitting self issue
2023-06-22 17:19:52 +01:00
GDN ff41b0b109 improves clarification on having martial arts as a non carbon (#21189)
* improves clarification on having martial arts as a non carbon

* worked in testing

* xenomicrobes
2023-06-14 21:18:24 +01:00
HMBGERDO fcbd8174e6 Slowdown on pulling (#21056)
* slowdown on pulling

* slowdown only when pulling structure or machinery

* moving speed modifier to /mob/living/carbon instead of all atoms

* added pull_speed to /atom/movable, moved movement_delay proc to carbon/human

* no-slowdown-trash-bin

* Update code/game/atoms_movable.dm

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

* removed pull_speed on /obj/item/storage/bag/trash, no need to set this

* more 0 pull_speed objects

* added gravity check, moved pull_speed to /obj

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-06-07 20:08:25 +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
GDN 910d07561e outta the closet (#21039) 2023-05-08 16:34:54 -05:00
Luc 495f5c423b Fixes a closet bug (#20819) 2023-04-05 20:39:05 +02:00
Coolrune206 acb04f2a73 fixes ghost locker exploit (#20427) 2023-02-14 21:18:46 +01:00
Luc a45f33c313 Shoving nerds into lockers (#20160)
* Adds locker shove impacts

* Feedback

* we do a little testing

* fuck
2023-01-19 14:48:14 -05:00
S34N 667dd5d4ac 515 Compatibility (#19636)
* 515 compat

* double spaces

* Callback documentation, aa review

* spacing

* NAMEOF_STATIC

* big beta
2022-11-08 23:08:40 +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
Contrabang 0766c5d2ae fixruntime (#19285) 2022-10-05 22:35:54 +02:00
AffectedArc07 e80f0e1d8d Revert "Adds animations for picking up and placing items. (#18702)" (#18824)
This reverts commit 2945bed697.
2022-08-17 16:18:12 +01:00
Luc 2945bed697 Adds animations for picking up and placing items. (#18702)
* Add initial support for telegraphing item pickups

* Add interaction to lockers

* Undo some extraneous changes

* Make pickpocket gloves not show any animation on pickup
2022-08-14 15:52:04 +01: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
KalevTait 6775604810 Code Readability - Crates_Lockers (#18270)
* crates_lockers

* use SECONDS where appropraite

* timer isn't in seconds, add a comment explaining that
2022-07-10 14:00:09 +01:00
Charlie bead47ea29 Adds crawling. (#17899)
* crawling?

* knockdown. CONTAINS CHANGES THAT NEED REVERTING

* plotting can_moves death

* CANMOVE IS DEAD

* mappers are insane

* removes todos as the are todone

* decreases crawling speed

* silly-con fixes

* surgery fixes

* fixes death

* pAI fixes

* removes var/lying

* runtime fix

* decreases default crawling speed

* correct crawling dir

* some more fixes

* stunbaton tweak, revert later

* rejuv fix

* restraint and incapacitated refactor

* crawling dir in line with TG

* fixes vehicle movement and grabs

* alien rest fixes

* antistun fixes

* fixed fall sounds

* forgor to stage this

* first review

* canmove zombie dispersal

* fix

* lots of fixes

* defines

* fixes the trait helper

* if you got no legs you can still crawl

* sillyconfix

* no reverty keepy

* jaunt fix

* hopefully fixes perma sleepy zzz

* admin rejuv temp fix

* rest canceling

* antistun chems now remove knockdown

* buckle offset fix

* fixes some stuff

* crawling delay = 4

* descuffs bed

* sleeping hotfix

* fixes simple mob resting

* V is the macro for resting

* projectiles no dodgy

* refines the projectile check

* god I hate strings

* MORE FIXES

* I hate buckling

* fixes capulettium plus

* winding down

* farie review

* bugs did stop showing up

* SEAN

* todo

* sean review

* ed209

* i HATE cyborgs

* steel review

* laaaaaast things

* reverts stun baton changes

* and done
2022-06-30 11:57:52 -05:00
Charlie 0f7a8707ef [Ready] Refactors stuns and status effects. (#17579)
* Fixes reviver runtime

* Confusion status effect

* Dizzy status effect

* Drowsiness status effect

* decaying -> transient

* Drunkenness status effect

* why use timer when SSfastprocessing work good

* stuns (mostly)

* weaken and immobalise

* stun/weaken times

* update_flags redundancies.

* Slowed()

* Silence + fixes transient decay

* Jittery

* sleeping

* Paralyze -> weaken

* Cult sluring

* paralyse

* Stammer

* slurring + projectile cleanups

* losebreath

* Hallucination

* forgor this

* eyeblurry

* eye blind

* Druggy

* affected didn't like my spacing

* review pass

* second review pass

* some cleanups

* documentation and signal framework

* confusion fix

* Fixes spec_stun

* rejuv fix

* removes a TODO

* conflicted myself

* fixes

* self review

* review

* removes TODOs

* adminfreeze

* TM fixes

* hallucination fix + others

* tones down alchol and runtime fixes

* confusion overlay suggestion

* more fixes

* runtime fix

* losebreath fix

* clamp => directional bounded sum

* steel review

* oops

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

* reduces the dizziness cycle rate

* borg hotfix

* sanctified decursening

Co-authored-by: mochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-05-24 16:35:26 +01:00
Dragonkiller93 6eeb6a1504 Borg locker verb fix. (#17408) 2022-03-09 14:13:22 +01:00
S34NW 5dc80d6cba steel pass 2 2021-10-02 22:26:37 +01:00
S34NW e78613e591 steel initial changes 2021-10-02 22:02:43 +01:00
S34NW c860b48c22 correct overlay adding format 2021-10-02 00:49:15 +01:00
S34NW 9820105059 final round of fixes 2021-09-28 12:18:38 +01:00
S34NW 83f8fbdfac locker door and open state trimming 2021-09-28 00:51:19 +01:00
S34NW 1c867b414c HERE COME THE CLOSETS 2021-09-27 19:33:42 +01:00
Mieszko Jedrzejczak 559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
SabreML 0b375de42c Removes the the vast majority of 'The the' from the the code (#15597)
* The the

* Some more

* Review 1

* A couple more
2021-06-20 10:20:32 -04:00
Aziz Chynaliev acfcce6728 Do not run hack in /obj/structure/closet if not mapload (#13) (#16201)
Co-authored-by: Simon Ogorodnik <simon.ogorodnik@gmail.com>
2021-06-18 16:41:05 +01:00
Sancronis 0a7adc58b0 Mobs are removed from closets first (#15658) 2021-03-28 12:11:03 +01:00
AffectedArc07 f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloud 403e44e25a Adds Closet Open/Close Sounds (#15627) 2021-03-02 09:27:02 +00:00
Fox McCloud 8947e97f3b Refactors Electrocution and Tesla Zapping (#15357)
* Refactors Electrocution and Tesla Zapping---Improves Supermatter and Tesla

* forgot this one

* fixes and styling

* last tidbits hopefully

* machine frames

* use flags

* styling
2021-02-03 20:52:03 +00:00
AffectedArc07 f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
AffectedArc07 f3d903acf3 Makes closets Initialize() (#15137) 2020-12-20 08:25:29 -05:00
variableundefined f029dd1dfc Revert "Close storage UI when item becomes inaccessible (#14536)" (#15126)
This reverts commit f54b6904b9.
2020-12-16 22:20:07 +00:00