Commit Graph

42236 Commits

Author SHA1 Message Date
BiancaWilkson
c559993703 brain undeleting juice (#22272) 2023-09-19 16:54:47 +01:00
Adrer
6c21d7e6b4 Remove ethereal jaunt from oblivion enforcer loadout. (#22389)
* Remove ethereal jaunt from oblivion enforcer.

* Updated description

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2023-09-19 13:14:25 +01:00
DGamerL
87781cefb6 Woooo (#22466) 2023-09-19 13:12:46 +01:00
Kaomiyo
b83a2926ab Fixes grammatical error in nuke wiring (#22475) 2023-09-19 13:12:08 +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
Adrer
2f7abf374f Allows silicons to switch modules while bolting/shocking (#22463)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-09-18 21:41:31 -05: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
GDN
c7b9899eaa fixes lavaland mc crashes (#22467)
* fixes lavaland mc crashes

* readded var
2023-09-18 18:51:30 +01: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
Sadhorizon
527fb7e5c2 gut lunch time! (#22285) 2023-09-17 20:18:34 -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
Contrabang
98d7753a5d wow (#22404) 2023-09-17 20:15:16 -04:00
matttheficus
8732b8d592 get off the internet! (#22420) 2023-09-17 20:14:00 -04:00
Sadhorizon
1465e5d4d3 Robodrobe and Robotics Lockers resprite (#22425)
* uniqueness

* tweak for robodrobe
2023-09-17 23:59:39 +01:00
Qwertytoforty
d1bbfeea82 fixes exploit with mining modsuit (#22450) 2023-09-17 21:45:59 +01:00
Luc
1fe3a2187d fix icon state for depot reactor (#22449) 2023-09-17 21:02:28 +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
Henri215
baf810e53f Being slapped now wakes you up (#22408)
* wake up already

* moar

* better now

* Update code/game/objects/items/hand_item.dm

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

* lets make this run

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-17 18:24:30 +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
Luc
115a14b30a Adds new goonstation powersink icons (#22313) 2023-09-17 18:24:03 +01:00
tristan1333
6983d4962c Fixes runtime, cluwned clowns waddle after being cluwned (#22379)
* Fixes runtime, clowns waddle after being cluwned

* pointless override removed
2023-09-16 20:44:32 -05:00
matttheficus
616f40b12d im tired of SecBorg Lite (#22378) 2023-09-16 18:03:42 -04:00
matttheficus
c13f410740 he forgor his new ward (#22387) 2023-09-16 18:01:30 -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
Henri215
c9f8b7dd67 NT Recruiter: Fixes a typo (#22406) 2023-09-16 16:57:39 -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
DGamerL
43c8045b8f Woooo (#22419) 2023-09-15 13:44:31 +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
Burzah
bc6e861ad6 Fixes blocked alien hand HUD (#22326)
* Fix for blocked hud on aliens

* Update code/_onclick/hud/screen_objects.dm

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

* parenthesis adjustment

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-09-14 20:08:04 -05:00
Marm
a586e16d81 Prevents Quartermaster job slots from being raised. (#22377)
* misery if you will

Blacklists QM job slots from being raised.

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-14 19:50:21 -05:00
Qwertytoforty
83812f3b01 :yea: (#22363) 2023-09-14 19:44:23 -05:00
warriorstar-orion
e4bba55b5e Update uplink implant description amount. (#22358) 2023-09-14 19:39:49 -05:00
JimKil3
fdbf9b1b0c i forgor 💀 (#22347) 2023-09-14 19:13:26 -05:00
Burzah
a888deeef1 name fix (#22330) 2023-09-14 18:59:17 -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
5c7bb7d89b Woooo what the fuck lmao (#22413) 2023-09-14 18:27:38 -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
Luc
0e3677fd15 update hud status on death (#22338) 2023-09-14 21:04:25 +01:00