Commit Graph

6606 Commits

Author SHA1 Message Date
Qwertytoforty
8a941bae66 fixes tabbing in nanny bag (#22708) 2023-10-04 20:59:59 -05:00
Burzah
73906ecc96 chem bio-chip logging (#22649) 2023-10-03 22:04:31 +02:00
biogod420
d374be622d added comments (#22662) 2023-10-03 13:29:45 -04:00
Contrabang
f3f9bd442a Changes slot number defines from lowercase to all uppercase (#22297)
* undo all of it

* flags

* back

* head/mask

* left

* right

* Cuffs

* other name changes

* ID and PDA

* idk about calling them SLOT_HUD now

* glasses, gloves, and shoes, oh my!

* the rest

* comment
2023-10-03 18:27:51 +01:00
warriorstar-orion
3a1f827041 fix runtimes setting empty crayon message (#22672) 2023-10-03 17:44:50 +01:00
ZERO-XZB
2b9ca38824 Bug fix for carrot shivs Fixes #22556 (#22627)
* carrot_progress

* more carrot testing

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* Bugfix for #22556

* Bug fix regarding carrot shivs (#22556)

* Update code/modules/hydroponics/grown/root.dm

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

* testing item.dmi fix

* hopeful items.dmi fix

* Update code/modules/hydroponics/grown/root.dm

Adds Contrabang's suggested parens.

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

---------

Co-authored-by: ZERO-XZB <temp@temp.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-03 17:40:02 +01:00
Adrer
1b4573cdf7 Adds supply department to agent ID options and cleans code (#22613)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-10-03 17:16:03 +01:00
Adrer
2672d02eb3 [s] Martial arts granted by equipped items no longer persist through cloning. (#22684)
* Martial arts no longer persist through cloning

* Remove unnessecary var declarations

* Combo counter

---------

Co-authored-by: Adrer <adrermail@gmail.com>
2023-10-03 08:47:19 +02:00
DGamerL
53c3e893c2 Fixes Crutches not working properly (#22660)
* Yippeee

* Proper order

* Update code/game/objects/items/weapons/misc_items.dm

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

* Apply suggestions from code review

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

* Update code/game/objects/items/weapons/misc_items.dm

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

---------

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-01 16:38:36 +01:00
Contrabang
7e0aa47311 Refactors objectives, expands team functionality, and custom teams (#22374)
* step 1

* renaming 1

* how could I forget this

* renaming 2

* renaming 3

* add matching proc, even if unused can remove later

* rename team obj to match

* oops

* okay more stuff

* okay more stuff

* fix this stuff

* okay more stuff

* needs_target = FALSE

* OKAY MORE STUFF

* OOPS AGAIN.

* self-review

* more round_end stuff

* stuff 119

* yeah fix that too

* EVEN MORE CHANGES

* grammar

* fix

* s34n review

* fixes custom teams with no antags not showing objs

* makes objectives work properly with teams

* a
2023-10-01 14:14:10 +01:00
Octus
2bdd9397aa Removes Pet Hospital, Adds Althland Corporation Refinery Ruins (#22287)
* byebyepet

* typo fix

* more typo fixes

* fixes

* another fix

* delete hospital shit

* ok seriously work now you fuc-

* improvements

* changes tempature

* heat proof lattice

* hi qwerty

* test

* ok lmao

* lattice moment

* oopsie!

* ok fuck you

* map update

* yes

* Revert "yes"

This reverts commit 9892a11232.

* Update lavaland_surface_althland_facility.dmm

* Update code/game/objects/items/stacks/rods.dm

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

* henri review

* adds lore

* fix

* fix

* more fix

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-01 12:24:43 +01:00
DGamerL
4c976a6e01 Splits up item_inhands.dmi (#22584)
* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* Fixes jackhammer and glass shard

* Fixes toy Chainsaw

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

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

* Update code/game/objects/items/weapons/weaponry.dm

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

* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm

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

* Fixes edagger hopefully

* Henri review

* Oops

* First this gone, and now the pain

* Should all be fixed now

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-01 11:47:25 +01:00
Luc
e757638648 Kills Check Pulse (#22501)
* unchecks verbs

* removes method
2023-10-01 11:41:39 +01:00
warriorstar-orion
f8d195f0b7 add crayon message customizer; port TG alphanumeric crayon decals (#22499)
* guh

* add crayon message customizer; port TG alphanumeric crayon decals

* docs
2023-09-30 08:41:42 -04:00
DGamerL
10c1c82c09 We using traits in this house (#22548) 2023-09-28 19:32:57 -04:00
matttheficus
5e914948b2 Logs Toy Cuffs/Twimsts Differently from Standard Cuffs (#22542)
* god i cant believe we have to do this

* im a silly goose

* K.I.S.S.

* better wording
2023-09-28 19:32:26 -04:00
Henri215
9d10226da2 Adds a new crutch mechanic (#22527)
* hidden compartment

* adjusting text

* NODROP

* Contra review
2023-09-28 19:31:32 -04:00
Fordoxia
cc76b29ff0 Cyborg Upgrade Typo Fix (#22554)
Fixes some typos and slightly rewords some flavour text for cyborg upgrade modules.
2023-09-25 19:19:17 -04:00
Contrabang
23c4e49eed [TGUI] Wall safes/secure briefcases (#22447)
* bam

* fix this

* fix

* thing

* prettier

* tgui

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

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

* guh

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-25 19:19:07 -04: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
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
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
Qwertytoforty
fe871e4097 moments pass, shattered glass (#22414) 2023-09-19 17:02:50 +01:00
matttheficus
a325543848 Logs Cryo/Suicide Amounts for TDM Gamemodes (#22354)
* logging time

* contra review

* im a silly goose

* RR addition

* sirryan review
2023-09-19 17:01:08 +01:00
HMBGERDO
d1d38d3982 eye stab bypassing everything fix, some med kits not working on use in hand fix (#22320)
* eyestab no longer bypass pacifism and shields

* medical items not working on activate fixes
2023-09-19 16:58:20 +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
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
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
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
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
DGamerL
5c7bb7d89b Woooo what the fuck lmao (#22413) 2023-09-14 18:27:38 -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
Contrabang
653fbdc8fb Heads' door remotes and access tuners now have a radial menu (#22175)
* radial stuff, wow

* hotfix

* unfuck this shit

* test

* aha, cool
2023-09-13 21:11:34 +01:00
Adrer
f84bbf85b9 C4 now properly explodes when an assembly is attached. (#22197)
* Changes assemblyholder to assembly in C4

* Minor change when planting C4 with assembly

* Update code/game/objects/items/weapons/explosives.dm

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

---------

Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-13 21:06:01 +01:00
Qwertytoforty
54161357f8 Flashbangs are now affected by pressure like sound. (#22286)
* did you know? Flashbangs require sound to work!

* Update code/game/objects/items/weapons/grenades/flashbang.dm

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

* smh making me do it myself (as you should)

* Update code/game/objects/items/weapons/grenades/flashbang.dm

Co-authored-by: Luc <89928798+lewcc@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-13 20:43:30 +01:00
GDN
7d1633f029 drops the price of the syndicate ai module significantly (#22298) 2023-09-13 10:42:51 +01:00
JimKil3
5450f598bf Adds the holo-cigar, a human-specific traitor item (#22062)
* badass trait

* the cigar

* sprites ft. mcramon

* makes it obtainable

* Apply suggestions from code review

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

* contra review

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

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

* Update code/game/objects/items/weapons/cigs.dm

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

* henri review

* contra broke everything

* contra broke everything pt 2

* Update code/modules/clothing/glasses/glasses.dm

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

* Update code/game/objects/items/weapons/cigs.dm

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

* lewc review

* update_icon_state

* Apply suggestions from code review

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

* Update code/game/objects/items/weapons/cigs.dm

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

* are you happy now dgamer

* henri review 2

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-12 17:10:23 -04:00
Contrabang
30dacc03e3 Adds crutches (#21959)
* crutches!

* comment update

* henri review

* comment tweak

* in-hands updated

* i can spell

* two handed component

* unfuck this file

* oh lord map changes

* make the placing a little more reasonable...

* changes to cyberiad
2023-09-11 12:50:05 -05:00
matttheficus
072a958398 Total Mining Points on ID/Ore Redemption Machine (#22143)
* it begins

* Revert "it begins"

This reverts commit 02f90f4ce9.

* oopsies, restart

* here we go again

* oopsie again

* god i finally figured out TGUI

* henri review

* tgui update

* Update tgui.bundle.js

* tgui

* Update tgui.bundle.js
2023-09-10 19:07:30 -05:00
DGamerL
a2922ad5fd [s] Fixes a fusion gauntlet issue (#22341)
* Infinite sparks go brrr

* Qwerty + Steelslsayer
2023-09-10 18:56:45 -05:00
JimKil3
aaad2a5aba Adds the Oblivion Enforcer wizard loadout (#21920)
* initial addition

* adds wall/airlock obliteration
this definitely needs to be tuned a bit numbers-wise

* adds TRAIT_SUPERMATTER_IMMUNE & gloves

* adds more checks for the supermatter immune trait

* removes SM tongs logic from the halberd
Realistically, you would never actually have the halberd and tongs

* makes slivers bulky

* dusting downed people
also removing a useless assigned variable i missed

* adds the (incomplete) loadout

* halberd buff

* adds robes + sprites

* oops

* halberd icons

* knockdown

* stuff

* timer shortening

* species sprites part 2

* animation for dusting walls

* Apply suggestions from code review

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

* early return

* parry numbers!

* Update code/modules/power/engines/supermatter/supermatter.dm

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

* dgamer review

* dgamer review + no more pulling

* reverts early return thingamajig

* Update code/modules/power/engines/supermatter/supermatter.dm

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

* removes `get_turf`

* hal review pt 1

* hal review pt. 2

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

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

* `carve_sliver` proc

* unfucks icons

* Apply suggestions from code review

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2023-09-10 22:15:12 +01:00
Marm
e59f0e8aea Makes the Quartermaster a Head of Staff (#22133)
* remote

* more additions

* tgui + ssu

* map edits

* Shut your mug

More changes, huds, mugs and icons.

* mug time

* aaaa

* fixes cere edits

* should fix it

* Update tgui/packages/tgui/interfaces/common/CrewManifest.js

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

* Update code/game/machinery/suit_storage_unit.dm

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

* Revert "Update tgui/packages/tgui/interfaces/common/CrewManifest.js"

This reverts commit 5de07cba58.

* mugs all the way down

Fixes locker headset oversight, adds icon for supply management console, new QM mug sprite

* more map changes

* wow this worked?

* Misplaced comma

Removes a misplaced comma.

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

* Mr QM's Wild Ride

Resolves a number of review comments, including preventing the QM slot being altered by the B/E event, adds a flash to the locker and reverts removal of basic cargo access from the HOP.

* Forgot a var name change, I'm gonna cry edition.

Renames name to board_name for supply ID computer.

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

* genesis 1:3

Alters light_color of supply management console to brown_orange from light_color_red

* Update code/modules/events/bureaucratic_error.dm

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

* another misplaced comma

Removes a comms where there should not be one.

* saving private ryan

Removes plasmacutter, adds mining GPS and crew monitor to QM locker contents.

* redone map changes

* oop

* the last of it

* merge time

---------

Co-authored-by: GDN <Roanrichards1@Gmail.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-10 20:53:05 +01:00
Contrabang
bb2b6d85fd Fixes some issues with revs (#22308)
* fixes to revs

* Update code/game/objects/items/weapons/implants/implant_mindshield.dm

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

* UH OH.

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-10 10:02:16 -05:00
Luc
d392209cb5 Reworks CPR, allowing it to extend defibrillation time (#21754)
* Update traditional CPR to loop automatically

* Implement most of the base stuff

* Bring over most defib changes so far

* Checks and fixes

* cleans up some leftovers, getting it ready for review

* Little bit of IPC flavor

* excludes non oxy-breathers, sorry!

* Better rescue breath handling

* Refactor revivability into a status effect

* Adds a little bit of feedback

* Removes the original variables

* Allows for CPR to activate cavity bombs

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

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

* snake case time

* breathid instead

* remove unused proc

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-09 21:59:47 -05:00