BogoTheDumass
927c41d6e9
Greys get a skull helm sprite. ( #22454 )
...
* grey_skull_helm_initial
* Update code/modules/clothing/head/helmet.dm
silly tab
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
---------
Co-authored-by: Bogo <jackdpickels@gmail.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-09-20 12:48:18 +01:00
GDN
685e0ee506
fixes a bunch of turfs being active roundstart ( #22233 )
...
* fixes a bunch of turfs being active roundstart
* some ruins
* qwerty dun broke it
* main stations
* that should do it
* i'm blowing up qwerty
* should be it
* empty commit to check ci
* merge fix
* yippie
* joyous
* lavaland tax
* regex w
* I'm gonna fax mapmerge a low teir god gif
* SOMEONE ELSE GOTTA GET FAXED
* Update code/controllers/subsystem/SSair.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
---------
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
2023-09-20 12:47:46 +01:00
Marm
5e8536871b
Cargo QOL + Mail Bag Fix ( #22500 )
...
* aaaaaa
I forgot
* mailn't
Removes QOL.
2023-09-19 21:09:57 -04:00
Marm
ecfaa26cc2
You've Got Mail! Adds Mail system ( #22269 )
...
* heres the mail it never fails
Adds envelopes and its functions.
* It makes me want to wag my tail
Adds new envelope sprites courtesy of McRamon, makes mail bags and envelopess able to be carried by cargo clothing.
* when it comes i want to whail
Makes Wizard and Nukie equip change to off station role. Adds mail crates and functionality/logging for randomly choosing recipients of mail.
* MAAAAAAAAAAAAAAIIIL!!!!
Adds functionality for the mail scanner alongside sounds. Begins the process of making mail arrive on the shuttle.
* MAIL
* THE MAILMAN IS HERE
* MAIL IS REAL
* Give me an M, give me an A, give me an I, give me an L. What does that spell? MAIL.
Finalises pre-review mail features, adding the mail scanner to cargo tech loadout/autolathe.
* Update code/game/gamemodes/nuclear/nuclear.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/modules/shuttle/supply.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/jobs/job/support.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/bags.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/bags.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/structures/crates_lockers/crates.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/controllers/subsystem/SSeconomy.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* check out what you got now
Removes unused sprite bloat.
* Update code/game/objects/mail.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/mail.dm
* Update code/game/objects/mail.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/mail.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update code/game/objects/mail.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/mail.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* First few Contra reviews
* Second batch
* Cl doesn't fail anymore
* Even more fucking reviews
* Doesn't quite work yet but we're almost there
* WHEN DOES IT EEEEEND
* I have no energy to make a blues clues reference
More commits to respond to reviews
* God I miss Steve
Adds hand sprites to mail scanners
* Woooo Mail works again
* Science envelopes
* Update code/game/objects/mail.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* my god it worked
II hate it
* Bread and Circuses
splits up service envelopes into two categories, addresses other reviews.
* Lewc review - needs testing
* Almost there
Changing lists and more.
* Last fix
* IT IS ALL WORKING NOW
* Mail. Is. Done.
Final pass.
* Update code/controllers/subsystem/SSeconomy.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/mail.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* The fix
* Just this one too
* Lewc review
* mail?
yeah
* Begone, ye powersink
* Sirryan review
* Update code/__DEFINES/economy_defines.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/mail.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/mail.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/controllers/subsystem/SSeconomy.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/game/objects/mail.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/game/objects/mail.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Wjpp[s
* Removes useless comment
* We ball
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@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: Luc <89928798+lewcc@users.noreply.github.com >
2023-09-19 19:30:03 -04:00
LiberatedWaveMan
e09be2b54e
You got a fuckin' problem mate? Adds the glass shiv (attempt 2) ( #22416 )
...
* Redoes the Shiv PR, adds shiv (ready to go)
* Update code/modules/crafting/recipes.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/crafting/recipes.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update kitchen.dm
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2023-09-19 22:47:53 +01:00
Marm
9a8cc71081
Adds conversion alert for Revolutionaries and Head Revolutionaries ( #22321 )
...
* are raging around us
Adds alert for both revolutionaries and head revolutionaries.
* Update code/modules/antagonists/revolutionary/datum_headrev.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-09-19 21:39:02 +01:00
Contrabang
cedb419059
Adds the adminspawn debug outfit ( #22223 )
...
* debug outfit
* slip
* fix this
* review
* lewc review
* refactors the huds to be "not shit"
2023-09-19 16:28:04 -04:00
Contrabang
1fcf41e300
AIs can now cancel bolting/shocking. Bartenders can stop shaking their shaker. ( #22342 )
...
* do_after_once
* Update code/modules/food_and_drinks/drinks/drinks_base.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/modules/food_and_drinks/drinks/drinks_base.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-09-19 19:47:49 +01:00
Contrabang
70b3652dc4
*collapse emote now does knockdown instead of paralyzing ( #21958 )
...
* bam
* balance changes
* 4 seconds -> 10 seconds
* henri review
* same crit changes, whoops...
2023-09-19 19:46:43 +01:00
Qwertytoforty
c0e29df99f
Kinetic schemetic ( #22440 )
2023-09-19 19:44:02 +01:00
Adri
d5328f7d7c
Fixes oversight about prescription glasses ( #22445 )
...
Co-authored-by: Miraviel <Miraviel@users.noreply.github.com >
2023-09-19 19:38:39 +01:00
Adrer
5ba2b97fe4
Allows silicons to print saved pictures on photocopiers again. ( #22461 )
...
* Allows silicons to print saved images again
* Changes addressed
* Update tgui/packages/tgui/interfaces/Photocopier.js
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
---------
Co-authored-by: Adrer <adrermail@gmail.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2023-09-19 19:37:37 +01:00
1080pCat
22620e77f7
Cantt suck in air if the fan is covered! ( #22357 )
2023-09-19 18:58:29 +01:00
Henri215
9fdf2992be
Ports Rod of Asclepius in hand sprites and moves staves in hands into a new file ( #22250 )
...
* Ports Rod of Asclepius inhand sprites and moves
staves hand.dmi into a new file
* removing for now
* its conflict time
* lets fix this conflict
* ah shit
* here we go again
2023-09-19 18:58:11 +01:00
Luc
f0c456f05b
Fixes infestation not using a valid name ( #22471 )
...
* have we finally found a valid use for \the
* remove redundant keys
* housekeeping
2023-09-19 18:51:01 +01:00
Luc
719a86faea
Adds a simple kudos system ( #21731 )
...
* Add simple kudos system
* oops
* Fix up the messaging
* convert to ckey-based tracking
* imagine being able to spell
* Adds some encouragement messages
* honestly quite incredible
https://user-images.githubusercontent.com/47290811/268751264-527a1f0a-3435-40f4-8cdf-1de005450037.gif
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
* jimkil review 2
---------
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-09-19 17:44:03 +01:00
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 f31cbae8be96800819+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 3b2531f50996800819+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
