Commit Graph

21246 Commits

Author SHA1 Message Date
HMBGERDO
feb480e39c if baton would stun cyborgs, it would stun bots too (#21062)
* if baton would stun cyborgs, it would stun bots too

* added visible message when stunning bots

* cleanup
2023-06-02 17:41:56 +01:00
HMBGERDO
214b6d39ee Decals now do not decline your action (#21055)
* decal location melee attack chain added

* supports hulk, simple animals, hand attack(touches)
2023-06-02 17:36:50 +01:00
HMBGERDO
02db93e37e Stunbaton delayed knockdown now respects antistuns (#21069)
* stunbaton delayed knockdown now moved into status effect

* renaming proc to keep its meaning

* made STATUS_EFFECT_DELAYED as status effect for any delayed logic, removed STATUS_EFFECT_BATONNED

* cleanup, little bug fixing

* cleanup

* whoopsie

* updates

* signal string changed

* Update code/datums/status_effects/neutral.dm

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

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-06-01 18:36:44 -05:00
S34N
bdb8039c8f Adds gorillas and cargorillas (#20830)
* goril

* goril2

* arms

* goril3

* goril4

* rampaging

* emote

* trait

* more gorilla

* ooga

* Magillitis Serum Autoinjector, crates

* return to monke

* remove unused trait

* oops

* sirryan

* earth

* Update code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm

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

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

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

* fixes and stuff

* gorilla text clarification

* tweak probs, stop if dead

* volume

* gorilla sleeping attack

* Apply suggestions from code review

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
2023-06-01 18:36:07 -05:00
Qwertytoforty
41a250c4a3 Ports TG supermatter effects / warp effect (#20808)
* [WIP] Ports TG supermatter effects / warp effect

* remove this as it doesnt work

* also remove this test

* Now with real pulsing effects!

* smoother animation

* adds effect to gravity generator / bsg

* Apply suggestions from code review

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

* Move to effect, singularity has effect

* remove effect from size one singularites / narsi

* now works through walls, yipeee

* merge conflict return I did not want

* Apply suggestions from code review

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

* Bug fixes and visual tweaks

* Apply suggestions from code review

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

* Update plane_master.dm

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-06-01 14:29:00 -05:00
Ryan
11717823df Power Code Cleanup + Conversion to Regional Powernets [Refactor Only] (#20598)
* initial edits

* more cleanup, yipee

* moving shit around

* dme fixes

* fixes file ticking issue

* more dme fixes + duplicate files???

* Apply suggestions from code review

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

* glass floor fixes

* Apply suggestions from code review

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

* requested reviews

* the most painful bugfix of my life

* forgot to remove some debug stuff

* fixed issues with excess power

* fuck powernets (fix)

* Update code/modules/power/powernets/README.md

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-05-31 20:55:10 -05:00
Samman166
49b26c4eba WT Rework and Nerf (#20536)
* Reworks and nerfs WTs

* Removes some duplicate comments

* Makes WT ammo box's normal sized items because I forgot to at first

* Adds a var to WT mags to check if they are being loaded to prevent people from queueing up multiple reload processes at once

* Sanity checks work properly now

* Implements changes requested, empty magazines now available from RND, ammo crate contains 5 full magazines, mag size set back to 20, magazines made normal sized items and fit in assault belt

* Update code/__HELPERS/mob_helpers.dm

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

* Update code/__HELPERS/mob_helpers.dm

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

* Magazines fit in security webbings

* I forgot a comma

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Applying various reviewer suggestions

* Applies various suggestions

* removes moving_do_after now that its a param

* Apply suggestions from code review

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

* solves the merge conflict hopefully

* step one of trying to fix conflict again

* step two hopefully fixes conflict

* Delete ammo.dmi

* Merge branch 'master' into wt-rework

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Applying various reviewer suggestions

* Revert "Applying various reviewer suggestions"

This reverts commit 7081e9aa2b.

* Revert "Apply suggestions from code review"

This reverts commit 96dab4f8b8.

* Revert "Merge branch 'master' into wt-rework"

This reverts commit 6906a67654.

* Merge branch 'master' into wt-rework

* please god work

* Update code/modules/projectiles/ammunition.dm

* Update code/modules/projectiles/ammunition/magazines.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-05-25 18:41:56 +02:00
Contrabang
8b7f4c8b69 OOPS (#21166) 2023-05-23 11:33:41 +02:00
Qwertytoforty
038a7abc13 Makes the dropwall probably viable (#21094)
* Makes the dropwall probably viable

* uses existing proc

* Update code/game/machinery/deployable.dm

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

* Apply suggestions from code review

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

* :gatto:

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

* Apply suggestions from code review

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

* Update deployable.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-22 22:26:39 +02:00
JimKil3
6ad882de48 adds them (#21085) 2023-05-22 22:25:09 +02:00
HMBGERDO
e8e85574d0 H-hel-lp m-main-n-nt-ts-s! (#21079) 2023-05-22 22:24:43 +02:00
asciodev
919103c557 Quantum pads now check AI cam visibility (#21074) (#21078)
* Quantum pads now check AI cam visibility (#21074)

Previously, quantum pads operated identically for living carbon mobs and
for the AI, teleporting the mob activating the pad via
/proc/do_teleport. This bypassed the AI Freelook visibility checking,
allowing AIs to view turfs surrounding the linked pad without actual
camera visibility.

This change adds special handling for AI eye interactions. When an AI
eye user clicks on the quantum pad, the eye will center on the pad if it
is not already, mimicking holopad behavior. If the AI eye is already
centered on the pad when it is clicked, the pad will be tested for
usability in the same manner it is for users, which logic has been moved
to its own proc. If the pad is usable, the turf of the linked pad will
be checked for visibility. If the turf of the linked pad is visible,
setLoc is called on the AI eye, allowing visibility chunks to be
updated. If it is not usable, the AI will receive a warning notification
similar to the one used when unable to track a mob via cameranet.

* Fix typo in quantum_pad.dm

When rebasing before submitting a PR, /obj/machinery/quantumpad/checkUsable was renamed to /obj/machinery/quantumpad/check_usable for naming consistency. However, I forgot to update all occurrences when doing so. This commit fixes that.
2023-05-22 22:24:33 +02:00
Qwertytoforty
efaf087a49 You can no longer crawl under protector guardians. (#21073)
* You can no longer crawl under protector guardians.

* Update code/game/gamemodes/miniantags/guardian/types/protector.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-22 22:24:10 +02:00
Contrabang
9eac813007 oversight gone (#21072) 2023-05-22 22:24:02 +02:00
Mooballoono
9e0dd390a2 Zippos can light Cigars (#21059)
* Makes it so Zippos can light Cigars

* accidental commit to master

* Zippos can light Cigars

* parentheses were in the wrong spots
2023-05-22 22:06:46 +02:00
Venuska1117
b3a5fd773c Fixes (Oversight?) with fungus spawner from #16877 (#21057)
* Changed Fungus
- Now fungus dont spawn wall if roll fails.

* Apply suggestions from code review

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

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-22 22:06:30 +02:00
Christasmurf
d8a6b6fbbb accesstweaks (#21029) 2023-05-22 22:05:47 +02:00
MisterMovie
0844b092a1 Fixes screwdriver_act on bloodstained recycler (#21024)
* Fixes screwdriver_act on bloodstained recycler

* Henri's review

* Vi3trice's review

* Sirryan's review
2023-05-22 22:05:19 +02:00
Henri215
764aed10c5 Adds custom age limits to each species (#20878)
* Custom min/max ages for species

* fixing the pitch

* tweaking AGE_MAX

* Revert "tweaking AGE_MAX"

This reverts commit 0270ba6840.

* max_age decreased roughly by 10%

* Update code/__DEFINES/mob_defines.dm

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

* machine minimum age

* clamp

* Adjustments to ages

* age max

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

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

* clamp and age pitch tweaks

* finally found plasmaman lifespan1

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-22 22:04:42 +02:00
Luc
d8ddda378b Deadchat Plays SS13: Ghost Control of Mobs (#20600)
* Add dchat control

* adds human support, cleans other things up

* Bit of cleanup

* actually use the item

* minor proc ref mistake, laugh at this user

* evil tg strings

* Renames defines, adds vv menu item for it

* Improve anarchy message formatting

* don't go to_chatting tesla energy balls

* aa review

* Minor cleanups, replace some emotes

* Addressing some reviews

* Incorporate some checks for deadchat mutes/prefs
2023-05-21 12:33:11 -05:00
Silverplate
73510a18ab Allows proximity mine signs to be used by all traitors (#20977)
* Removes jani mind requirement

* makes arm/disarm of jani sighs traitor only

* Adds mindslaves to usable mind states

* adds prox sign to surplus, standard proability

* Removes thralls from using sign (hacky method)

* allows mindslave useage (not hacky way)
2023-05-21 12:10:02 -05:00
Edan
d8dc1aa221 split vampire & traitor (#21140) 2023-05-20 19:27:18 +01:00
JimKil3
dd3a23de7d Adds four new departmental tools (#20822)
* engineering crowbar

* engineering crowbar map changes

* command multitool description overhaul

* command multitool inhands

* security wirecutters

* security wirecutters map changes

* science welder

* crowbar weight class

* science welder suicide act

* welder map edits

* oagh
fixes "the the research welding tool" in its suicide act

* cargo screwdriver

* immobilize > stun

* cargo screwdriver mapping in

* sirryan review

* lewcc review

* oops

* comment clarification

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

* forgor 💀
I forgot to stage the changes to this file before the last commit

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-05-14 18:00:23 -05:00
Ryan
1f08b497e7 Reduces Cargo Export Revenue for Plastic Crates (#20988)
* adds value variable to crates

* fixing an initial value for crate count definition

* Update code/modules/shuttle/supply.dm

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

* removed unused SSeconomy var

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-05-14 00:24:14 +02:00
Nathan Winters
05c8131406 Fixes roundstart airlocks not setting unrestricted access sides on electronics when deconstructed (#20986)
* Fix roundstart airlocks not copying unrestricted access to electronics

* Let airlock electronics set multiple unrestricted access sides
2023-05-14 00:24:07 +02:00
S34N
04377481a2 Holding a plant pot hides mob HUD (#20868)
* hide plant pot

* different method

* GC

* what am I even doing
2023-05-14 00:23:44 +02:00
Qwertytoforty
92785fb689 Security slots can no longer be opened or closed (#21043) 2023-05-13 23:45:27 +02:00
Qwertytoforty
970b593e7d Makes emp bomb more useful (#21014) 2023-05-13 23:45:00 +02:00
Farie82
0fedbb9257 Camera net/chunk refactor. Slight performance improvements and makes it GC properly (#20302)
* Add SScamera

* Refactor camera

* Refactor how camera chunks add/remove cams

* Use CAMERA_VIEW_DISTANCE to determine max view dist of cam

* Fix movable cameras and optimise them

* Optimise update()

* Ensure aiEyes get removed properly when deleted

* Final optimisations and refactoring

* Fix cameras being EMPed

* Shits fixed

* AA review

* Fix merge mistake

* Add comment about early return

* Seans review

* the it the

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update code/game/machinery/camera/camera.dm

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

* Ensure the robit has a camera before updating it

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-12 14:58:23 -05:00
GDN
092fe017a5 Tea heals a bit more if you're british (#21068)
* chav now gives slight healing on tea

* Update code/_globalvars/traits.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-12 07:52:55 +01:00
Luc
b0567b2778 Fixes superslaps (#21011) 2023-05-11 13:51:44 -05:00
McRamon
04259acdbd Visual update of shadow cocoon (#21012)
* coders

* icontest, who knows maybe the code copypasta worked

* Update shadow_demon.dm

* fuck it

* george

* ok this is fine
2023-05-11 13:46:43 -05:00
Taran
2fa07ac844 calculates richest escapee by including account balance along with cash (#21004)
* calculates richest escapee including account balance

* runtimes bad

* Update code/game/gamemodes/scoreboard.dm

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

* Update code/game/gamemodes/scoreboard.dm

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

* Update code/game/gamemodes/scoreboard.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-11 12:31:52 -05:00
GDN
607543b370 fixes ripleys having their movespeed capped while using thrusters (#20961) 2023-05-11 11:18:38 -05:00
Octus
a7156dce16 Reworks cult sharding to not perma kill mindshielded victims [Needs TM] (#20402)
* fucking cult

* WERE STILL WORKING ON ITTTT

* d

* Revert "d"

This reverts commit 8a4bf06f5c.

* MOREEEE

* update

* Revert "update"

This reverts commit 65d85eae87.

* only chap can do it now lmao

* WHOOPS

* OK NOW

* Update runes.dm

* Apply suggestions from code review

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

* PLEASE TESTMERGE AAA

* fixes some stuff, improves it

* fixes the code from merge conflict

* Update code/game/gamemodes/wizard/soulstone.dm

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

* fixes a bug with shit not dying due to brains

* Adds some GC stuff, Sirr's code reviews.

* finishes the last changes and reviews

* missed 1

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-09 19:41:40 -05:00
Henri215
5dc6151ce7 Adds a new sound for when the janitor proximity mine is activated (#20976)
* Adds sound to the janitor proximity mine

* here comes the sound

* Not necessary
2023-05-08 16:52:48 -05:00
GDN
910d07561e outta the closet (#21039) 2023-05-08 16:34:54 -05:00
Henri215
c0b2ff7a51 Adds sounds for sleepers (#20964) 2023-05-08 11:00:37 -05:00
GDN
12c154532e plastic crates no longer drop metal (#20984) 2023-05-02 18:28:04 -04:00
matttheficus
db2aac4c1b im a silly goose (#21005) 2023-05-02 22:10:33 +02:00
Taran
0c84441530 updates detective access (#20960)
Detective can now access brig timers, perma, and the equip room
2023-05-02 21:59:51 +02:00
Taran
ebca647b5e turns off fire alarm sounds when power is off (#20956)
* turns off alarm sounds when power is off

when power is turned off a given fire alarm will stop playing the alarm sound.

* resumes alarm when power returns

firealarm sound returns when power is restored
2023-05-02 21:59:43 +02:00
Qwertytoforty
ce78b11870 gives spellblade with lightning grant the user shock immunity (#20949)
* gives spellblade with lightning grant the user shock immunity

* Apply suggestions from code review

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

* Update code/game/objects/items/weapons/melee/melee_misc.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-02 21:59:21 +02:00
Henri215
a5efbd32e8 USSP update part 2 (#20926)
* USSP part 2

* swapping old version for new one in some places
2023-05-02 21:59:01 +02:00
matttheficus
fc87927f7b Tool Size Tweaks (#20586)
* The Great Toolening

* oops all belts (incoming self conflict lul)

* defines shouldnt lie

* mini crowbar TODOs

* beeeeeeeeeg crowbar

* oops it needs a design

* purple kit + vendor fix

* add mini crowbar dmi

* oops forgot this

* i am an idiot sandwhich

* im bad at code

* scratch that, i cant read my VSC

* wrench undo + readd to boxes

* nukies too

* man i cant code

* power tools should logically follow

* formatting

* maybe im free?

* forgot inhands

* Update toolbox.dm

* bluespace belt buff (unironic)

* undo for now

* fixes bluespace/tot belts + adds w_class override

* adds small crowbar to e-toolboxes and tot tools

* power tool fix

* Rnd build path

Co-authored-by: Adrer <erwin@lombok.demon.nl>

* design fix

* merge conflict + small fix

* small name fixes

---------

Co-authored-by: Adrer <erwin@lombok.demon.nl>
2023-05-02 21:43:06 +02:00
Contrabang
282f1cb62c Nuke resprite revival (#20888)
* nuclear revive

* stage fixes

* allows for the core to show while panel is closed

* adds blob nuke

* oops merge failure

* sirryan review

* grammar fix in comment
2023-05-02 21:28:42 +02:00
matttheficus
ca6717c0a4 Full Belts No Longer Fit in Bags (#20547)
* The Beltening

* Antag Belt Buffs

* This needs some sanity work, it is currently non-functional

* it finally works

* fix spawn bug + bluespace/laz belts

* comments moment

* im silly + autodoc

* just in case tm

* grammar

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

* better coding practices are fun

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* sane code, thanks sirryan

* better coding practices

* review fixes

* bluespace bag fix

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-05-02 21:19:02 +02:00
Henri215
b9952532eb Adds the bureaucratic error event (#20582)
* camera failure event

* Increasing the amount

* No disabling cameras on protected areas

* Adds the bureaucratic error event

* human resources department is lore friendly

* Pick instead of rand

* ops

* Added allow_bureaucratic_error to jobs

* scales up with number of engineers

* mundane category

* Update code/modules/events/camerafailure.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* conflict fix

* No error for blacklisted jobs

* Update code/modules/events/bureaucratic_error.dm

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

* Lewcc review

* better file name

* better name part 2

* farie review

* Apply suggestions from code review

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

* Update code/modules/events/camera_failure.dm

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

* Update code/modules/events/bureaucratic_error.dm

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

* checking for admin only

* Blacklist and small fix

* Farie review

* Update code/modules/events/bureaucratic_error.dm

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2023-05-02 20:57:45 +02:00
McRamon
3dbb2726ed Autopsy scanner resprite (#20957)
* moved icon

* code too

* sprite

* inhands
2023-04-27 18:37:36 +01:00
GDN
b7b45a0dbe cryogenic area spelling fix (#20935) 2023-04-27 18:28:02 +01:00