Commit Graph

26638 Commits

Author SHA1 Message Date
DGamerL
6481148747 Nerfs disarms (#22215)
* The thingy

* Oh my god I am a genius
2023-09-19 17:04:18 +01:00
DGamerL
86a36452ad Fixes Queen bees not being able to be mutated (#22443)
* Guh

* This too
2023-09-19 17:02:40 +01:00
DGamerL
d8b2cdf329 Reduces the power amount needed for the BSH. (#22353)
* UNEXPECTED POWER SPIKE

* I forgor to push this yesterday
2023-09-19 16:59:52 +01:00
Qwertytoforty
d750db7011 Being in space kills you again with solar flares / rad storms. Also now affects deep space (#22264)
* Being in space kills you again with solar flares / rad storms. Also now affects deep space

* oh god unit tests.

* fucking autocomplete

* I will murder autocomplete. It will not survive.

* Rename trait

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

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-19 16:57:09 +01:00
BiancaWilkson
c559993703 brain undeleting juice (#22272) 2023-09-19 16:54:47 +01:00
DGamerL
87781cefb6 Woooo (#22466) 2023-09-19 13:12:46 +01:00
Burzah
8530aa2b78 Removes appearance options not available to species from mirror (#22359)
* appearance menu checks

* review and flag change to moth
2023-09-19 12:04:12 +01:00
tristan1333
5028f63cd7 handheld mirror traitor item (#22042)
* Adds handheld mirror item and adds it to traitor items

* Adjusted cost for economy refactor

* Revert "Adjusted cost for economy refactor"

This reverts commit f31cbae8be.

* actually adjusts properly

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

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* removes redundant proc

* Adds inhand sprite and adds herald cloak functionality

* Revert "Adds inhand sprite and adds herald cloak functionality"

This reverts commit 3b2531f509.

* undoes the toolboxdmi change

* REMOVES CODER SPRITE FROM DEVICES

* fixes a runtime

herald cloak would runtime when teleporting to a person holding a mirror object in hand/pocket

* stuns anyone holding a mirror when jaunted through

* fixes merge conflict and changes uplink description

* mergeconflict

* actually fixes mconflict

* please bro just fix the conflict bro please

* Fixpls

---------

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
2023-09-19 12:03:44 +01:00
Adrer
7c238c1d6a No longer drop items in other hand when one hand is lost (#22462)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-09-19 11:55:12 +01:00
Luc
28e052d4ec Fixes anomalies not spawning right (#22474)
* fix broken anomalies

* Apply suggestions from code review

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-18 21:34:31 -05:00
Luc
788dd0fa00 Prevents mobs from emoting while dead (#22470) 2023-09-18 18:50:58 +01:00
Luc
0bd97b3e73 Refactors false alarms (#22010)
* rework anomalies

* oh yeah, events, too.

* does remaining events

* fixes most issues

* oops

* this too

* ensures traders actually fake announce properly

* fix tear

* missing return

* And another missing return
2023-09-18 13:15:34 +01:00
DGamerL
fe139d1093 Aaaaaaaaaaaa (#22453) 2023-09-17 20:38:52 -04:00
Contrabang
62e8c46f21 Fixes some issues with the ERT manager (#22306)
* fixes some keycard and ert manager stuff

* Update code/modules/admin/verbs/pray.dm

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-09-17 20:35:10 -04:00
DGamerL
4990604711 Xenos can no longer get viruses (#22395)
* Okay it works now maybe

* Oops this is the actual fix

* I am praying this went correctly

* Lewc review
2023-09-17 20:21:23 -04:00
DGamerL
30fa7b23ec Severely nerfs stutter (#22316)
* Severe S-stutter nerfs

* Eh we bring this back up
2023-09-17 20:19:44 -04:00
Contrabang
cb909df3cf Fixes dusting. (#22344)
* dust properly

* oops

* Update code/_globalvars/traits.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-17 20:19:28 -04:00
HMBGERDO
2dd88fab76 Burn wound surgery (#22105)
* adds burn wound surgery

* burn wounds review changes

* Update code/modules/surgery/other.dm

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

* Update code/modules/surgery/other.dm

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

* Update code/modules/surgery/abstract_steps.dm

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

* Update code/modules/surgery/other.dm

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

---------

Co-authored-by: cybercapitalism <petersmovie@live.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-17 20:17:56 -04:00
DGamerL
3693e6d620 Epi autoinjectors are now a subtype of autoinjectors, the basetype is now empty (#22261)
* removing the useless feature
Yes this removes it from all autoinjectors
No I am not going to publish this

* WOOOOO REGEX WORKS

* Almost forgot the entire reason of this PR

* Oversight

* Update code/modules/reagents/reagent_containers/hypospray.dm

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

* Update code/modules/reagents/reagent_containers/hypospray.dm

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

* Lewc review

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

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

---------

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-17 20:15:43 -04:00
matttheficus
8732b8d592 get off the internet! (#22420) 2023-09-17 20:14:00 -04:00
Qwertytoforty
d1bbfeea82 fixes exploit with mining modsuit (#22450) 2023-09-17 21:45:59 +01:00
HMBGERDO
0b92d0728c Fixing examining logic (#22180)
* fixing examining logic

* new glob proc, god this looks much better

* this looks much better

* dont need this

* if they're missing arm, we know they're missing hand
2023-09-17 18:26:11 +01:00
GDN
f76a94e05a fixes battlemage armor recharging (#22436) 2023-09-17 18:24:36 +01:00
DGamerL
05c6654fce Adds a new spell, Summon Cheese (#22393)
* Here we go so Cheese
Cheese
Cheese
Butter
Spread it

* I hate that this is so much better
Cheese

* CC mapping changes

* Update code/game/objects/items/granters/action_granters/summon_cheese.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-17 18:24:19 +01:00
matttheficus
616f40b12d im tired of SecBorg Lite (#22378) 2023-09-16 18:03:42 -04:00
Henri215
bae59f63aa Fixes service not receiving credits when selling seeds discoveries on cargo (#22403)
* Fixes service dept not receiving credits for seeds
discoveries when sold

* space
2023-09-16 16:58:34 -04:00
Adrer
0b36b64ed8 [s] Disposals now checks for density before expelling (#22274)
* Disposals now checks for density before expelling

* Update code/modules/recycling/disposal.dm

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

---------

Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-09-15 23:56:57 +01:00
Qwertytoforty
6ae2cce8c6 Vortex parry arm is now abstract. (#22184)
* I hold my own arm in my hand like a terraria zombie

* Update code/modules/surgery/organs/augments_arms.dm

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

* Update code/modules/surgery/organs/augments_arms.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-09-15 23:54:44 +01:00
S34N
ea9ea59a32 Revert "fireflash_sm is now more dangerous (#21951)" (#22399)
This reverts commit 51f138ad69.
2023-09-14 20:41:49 -05:00
Qwertytoforty
83812f3b01 :yea: (#22363) 2023-09-14 19:44:23 -05:00
JimKil3
fdbf9b1b0c i forgor 💀 (#22347) 2023-09-14 19:13:26 -05:00
Luc
4a8d7ad4a4 adds notif when you get stuck in a pipe (#22327) 2023-09-14 18:53:36 -05:00
Adrer
1dffbdba56 Fixes runtime with sound emotes (#22275)
* Check if emote can be ran before checking cooldown

* Minor styling change

* Remove else statement

* Removed duplicate can_run_emote from try_run_emote

---------

Co-authored-by: Adrer <adrermail@gmail.com>
2023-09-14 18:33:32 -05:00
DGamerL
859a38cde2 Stops sleepers from runtiming when attempting to dialysis (#22398)
* How did nobody see this including me

* IV bags too

* Oops
2023-09-14 21:06:29 +01:00
Contrabang
e0d75a9b45 Central Command crew monitoring consoles can now see across all sectors. (#22140)
* advanced crew monitor (for CC)

* dont run on new, im dumb

* fixed

* oops... dont forget that.
2023-09-14 18:26:37 +01:00
HMBGERDO
ce870fabd8 Fix: You can once again help people while having martial arts (#22394)
* fookin loops

* not need this

* Update code/modules/martial_arts/martial.dm

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

* Update code/modules/martial_arts/martial.dm

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-13 21:16:41 -05:00
Qwertytoforty
d42d2f647d Added the Combat Bakery Kit (#21901)
* QUASO

* Apply suggestions from code review

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

* blame lewc for giving me spaces

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/datums/components/boomerang.dm

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

* Apply suggestions from code review

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

* Update code/game/objects/items/granters/_granters.dm

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

* purge that

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-13 21:32:30 +01:00
Sadhorizon
0e371e1b93 Unathi (and Ash Walkers) can ignite stuff now, removes tail lash. (#21981)
* stuff

* works!

* bye bye tailwhip

* renames the ability

* accidental enter

* snowball's reviews

* tweak

* less tight timing
you can now ignite on 3u instead of 4

* no longer works with covered mouth

* ash walkers

* most of jimkils reviews + unathi also have c/d now

* early returns, uses less fuel, comments

* hal's reviews

* redundant comment

* hal's suggestion

* sounds & tweaks

* an unnecessary check
apparently

* so that check WAS needed

* henri reviews, tweaked loc of sounds, timer tweaks

* henri review

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

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-13 21:25:09 +01:00
Tourte-Yaya
efe6dc810e Makes admin outfits set offstation_role to true and give syndicate factions to SIT and SST. (#22169)
* Update outfit_admin.dm

* add trailing newline

* GDN suggestion

* Update code/datums/outfits/outfit_admin.dm

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

* Update code/datums/outfits/outfit_admin.dm

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

* Update code/datums/outfits/outfit_admin.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* Contrabang suggestion

* Update code/modules/mob/living/carbon/human/human_mob.dm

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

* Update code/modules/mob/living/carbon/human/human_mob.dm

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-13 21:12:26 +01:00
Luc
3e48654be3 Adds a quick-expansion gibbing proc, applies it to lazarus and instagib rifle (#22188)
* Adds quick explosion for laz gibbing

* Applies to instagib and mint

* Apply suggestions from code review -- timers

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-09-13 21:08:14 +01:00
Marm
125a84514a Ports radio transmit noises (#22216)
* video killed the radio star

Adds two sound effects, one for normal radios and one for Security radios. Makes radio_common play when talking on comms.

* we cant rewind we've gone too far

Adds checks for certain radio comms channels to play Security radio sound.

* Pictures came and broke your heart

Adds volume mixer support.

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

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

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

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

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

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

* Put the blame on VCR

Makes preference toggle more readable.

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

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

* I forgot what song I kept quoting

Add code comment clarifying purpose of define.

* The fix

* Contra review

---------

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-13 21:05:01 +01:00
Cocacolagua
25dd98b449 Lets the bureaucracy mishap event have a chance to roll rare jobs (#22218)
* damn bureaus

* nah nvm detective ur good

* it isnt 10% anymore

* rev1

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

* rev2

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-09-13 21:02:08 +01:00
1080pCat
cb63d07287 Makes portable scrubbers and pumps take fire damage. (#22249)
* mm atmos

* Like this would be better.

* oops

* FALSE to NONE

* deconflict+DGL review

* oops

* oops 3, third times the charm!
2023-09-13 20:55:00 +01:00
Contrabang
e28a57798d CI now bans nearspace that is not on turf/space (#22263)
* nearspace now fails if the turf is not space

* uhh, forgot airless platings. Those are fine too.

* yeah, put the name down too

* first round of fixes

* cerestation too

* code changes

* oops double space error

* delta fixes?

* fixes

* fuck, uh, keep it but make it airless

* there we go. All fixed

* uhhh, now it works?

* this is my guess
2023-09-13 20:48:55 +01:00
Octus
d33e8dbd7a Update hivelord.dm (#22288) 2023-09-13 20:25:10 +01:00
SchrodingersWolf
66e75b7321 Removes Styptic Powder, Silver Sulfadiazine and Synthflesh from base Medical Hyposprays (#22259)
* Woe be to Medical antags

* Removed Styptic, Silversulf and Synthflesh AGAIN
Ultrakilling DGamerL

* Ultrakilling both S34N and DGamerL now
2023-09-13 20:20:40 +01:00
Bjamcham
05880974f6 You can no longer stack Rad Collectors on the same turf (#22317)
* Stack wrenching begone(questionable code edition)

* Review round one, I am blind

* The expected rewrite
2023-09-13 18:02:01 +01:00
HMBGERDO
d7977ca79a combo now restarts if step failed (#22322) 2023-09-13 18:01:37 +01:00
GDN
4bb83f8bf0 fixes mobs with clients trying to dodge while moving (#22324)
* fixes mobs with clients trying to dodge while moving

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

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

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

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-13 18:01:29 +01:00
GDN
f698eacaef machine people are no longer affected by headslugs (#22323) 2023-09-13 18:01:21 +01:00