Commit Graph

25529 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
Henri215
f2ef07239f Updates piano path (#20839)
* Updates piano path

* ops
2023-06-02 17:34:10 +01:00
S34N
02556b4105 gorillas reborn (#21218) 2023-06-02 11:28:16 -05:00
Luc
25cc41a8de Improved Alien Examine (#20655)
* Moves code around from base human to more general functions

* Remove human handlers p much entirely, more reorganization

* Little bit more reorganization

* Remove todo

* Extract brute message checks

* updating

* Updates

* little bugfixes and cleanup

* Apply suggestions from code review

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

* Update code/modules/mob/living/carbon/examine.dm

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

* squish hex code in

* Apply suggestions from code review

* Adds legcuffing

* ooooops

* Farie review

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-06-02 10:08:51 -05: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
Qwertytoforty
34a7003c5a minor spelling mistake (#21131) 2023-05-22 22:27:08 +02:00
Nathan Winters
6f57af4f95 Fix plant reagent genes producing more chemicals than expected (#21126) 2023-05-22 22:27:02 +02:00
JimKil3
c5c5ce7694 Clears upgrades properly, not just their effects (#21100) 2023-05-22 22:26:52 +02:00
JimKil3
68154c9813 minor spelling mistake (#21095) 2023-05-22 22:26:46 +02:00
Qwertytoforty
2517851800 Nerfs laser rifle ammo size and emp proofness. (#21082)
* Nerfs IK ammo size and emp proofness.

* description / emp

* Update code/modules/research/designs/weapon_designs.dm

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

* Update code/modules/projectiles/projectile/beams.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:25:03 +02:00
Nathan Winters
8000a0e40b Converts Perfluorodecalin's side-effect into an actual overdose (#21081)
* Converts Perfluorodecalin's side-effect into actual overdose

* Make Perfluorodecalin heal its own OD again
2023-05-22 22:24:53 +02:00
HMBGERDO
9d5a876676 flash ability to destroy shadow snare (#21076)
* flash ability to destroy shadow snare

* Update code/modules/antagonists/vampire/vampire_powers/umbrae_powers.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:26 +02:00
DGamerL
a6934eb661 Changes the hacking implant to the abductor toolset implant (#21067)
* hacking implant is no more

* correct icon
2023-05-22 22:06:55 +02:00
Nathan Winters
5b54da3f37 Fixes vox lungs being affected by infections (#21050)
* Make vox lungs sterile

* Deproperpronounize vox lungs
2023-05-22 22:06:21 +02:00
HMBGERDO
3931617e67 SWAT suit tweak (#21049)
* removed SWAT suit spaceproof, removed SWAT suit slowdown, added BLOCKHAIR to SWAT helmet

* Update code/modules/clothing/suits/armor.dm

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

* Update code/modules/clothing/suits/armor.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-05-22 22:06:13 +02:00
Kyani
1aa914ac02 Update recipes_oven.dm (#21033) 2023-05-22 22:05:56 +02:00
Qwertytoforty
1fd9336cf3 Removes bluespace crystal sheets, makes crystals look as expected (#21028) 2023-05-22 22:05:34 +02:00
HMBGERDO
9e5807a9f4 Fix: Trash bin icon not updating when someone got shoved in (#21021)
* added update() to method /obj/machinery/disposal/shove_impact

* Update code/modules/recycling/disposal.dm

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

---------

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2023-05-22 22:05:10 +02:00
Qwertytoforty
0b25b15536 Makes lwap scope not freak out if move before scoping (#21007)
* makes scope not freak out if move before scoping

* jesus christ qwerty nice fucking infinite loop
2023-05-22 22:05:02 +02:00
Vi3trice
6bf89dd257 Check if on the same turf (#20998) 2023-05-22 22:04:52 +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
Taran
7b2bd705b2 Fixes molotov cocktails being used to craft molotov cocktails (#20989)
* blacklists molotov cocktail for crafting itself

* prevents using a blacklisted items to craft

* for loops ands comments

* Update code/modules/crafting/craft.dm

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

* Update code/modules/crafting/craft.dm

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

* adds missing ")"

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-05-22 21:31:27 +02:00
GDN
bf42f3dac0 translators no longer bypass mutes (#20756) 2023-05-21 13:19:45 -05: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
HMBGERDO
3d9d661853 added hands ID check for security bots to determinate threats (#21061) 2023-05-17 17:32:57 +01:00
Contrabang
6c295638cb Buffs Adminordrazine against stamina and cold (#21044)
* buff juice

* handles no dna case

* comments are good too

* hal review
2023-05-17 17:31:51 +01:00
Qwertytoforty
0135644e07 Chemicals that reduce pain make the users personal health bar less accurate (#20970)
* Chemicals that reduce pain make the users personal health bar less accurate

* Update medicine.dm

* health doll accuracy / screen cover

* define that shit

* makes it a proc
2023-05-14 00:24:21 +02: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
Henri215
c68a421171 boop emote sound (#20965) 2023-05-14 00:24:00 +02:00
Qwertytoforty
27aba816b8 Fixes BSG and lwap mob /icon sprite issues (#21064)
* Fixes BSG and lwap mob /icon sprite issues

* ratios ratio
2023-05-13 23:45:32 +02:00
Zelf
e81cba993a Fixes missing Krav Maga sprites for certain species, vulps no longer have broken radiation hood sprites and vox can now poke their beak through pumpkins. (#21025)
* vulp rad helmet hood whatever the fuck its called

* vox pumpkin

* blumpkin vox and pumpkinvox tweaks

* HELP THE DRASK HAS KRAV MAGA

* Admin the grey warden is spaming neck shop on me

* kidan kravmaga wasdagfsdasd add me on osrs - baomb

* grye krave maga👽👽👽👽
2023-05-13 23:45:14 +02:00
Luc
2db545600d Xenomorph Deathrattle (#21023)
* With ghost message

* and without

* remove some leftovers
2023-05-13 23:45:07 +02:00
Taran
86f4ee7a75 fixes bacon from cutlets in hand (#20974)
* bacon from cutlets in hand

raw cutlets can now be cut in hand to create bacon

* put bacon in hand when made
2023-05-13 23:44:53 +02:00
Vi3trice
84e7528805 Rework the cryo cell's handling of the occupant icon (#21017)
* We all float down here

* Update cryo.dm

* That var isn't needed anymore

* Update cryo.dm
2023-05-12 17:33:26 -05:00
Coolrune206
187a755509 tweaks demon spawn rate (#20699) 2023-05-12 22:02:25 +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
Taran
4a1873023a Prevents IPC husking (#21045)
* prevents IPC husking

* moves check to become_husk()
2023-05-12 07:53:47 +01: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
GDN
73269c0527 forcemodule fix (#21009) 2023-05-11 11:50:59 -05:00
GDN
53cf9765bc xenos no longer permakill dead carbon mobs by consuming them (#20952) 2023-05-10 14:10:13 -05:00
Nathan Winters
376858d908 Fix 0.1u reagent amounts behaving inconsistently (#20969) 2023-05-10 14:05:34 -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
a85d4bd9ae Fixes bureaucratic error event runtime (#21010) 2023-05-08 17:11:32 -05:00
Henri215
8809ada03e Thunderdome no longer allows unfair fights (#20981)
* Thunderdome no longer allows unfair fights

* surplus candidate warning
2023-05-08 16:44:47 -05:00
Kyani
0e95bc8e03 Update blood.dm (#21032) 2023-05-08 16:34:21 -05:00
Kyani
060bc0d741 Fixed Jestosterone removing clown waddles (#21035)
* Update misc_reagents.dm

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

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

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-05-05 15:48:52 -05:00