Commit Graph

2524 Commits

Author SHA1 Message Date
Adrer
aa7ea39f48 Morgue tray now updates properly (#23109)
* Morgue tray now updates properly

* Return of the guard clause

* Send signal upon ghosting/reentering

* Correct source for reenter corpse signal

* Signals split up, now works with DNR

---------

Co-authored-by: Adrer <adrermail@gmail.com>
2023-11-03 19:22:47 +00:00
matttheficus
7e7f03c906 Elite Tactical Magboots (#22968)
* here we go

* notes

* sprites

* this is needed

* some tweaks to gear

* nit

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

* fix this

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-10-31 18:35:05 +00:00
warriorstar-orion
7835ff6de4 Apply living checks to dispenser stations. (#23034) 2023-10-30 19:11:20 +00:00
Bjamcham
81a1105d74 I feel like I'm missing something (#23062) 2023-10-29 10:15:36 +00:00
Christasmurf
eed4890be5 white beret (#23013) 2023-10-27 20:19:45 +01:00
Henri215
7ddf9c4250 Extinguisher cabinet resprite (#23003)
* lets put out this fire

* lets paint it red

* adjusting the code

* Extinguisher cabinet resprite
2023-10-27 20:18:59 +01:00
Daniel Lenrd
2f173c48c2 Added extra items to RD garment bag (#22916)
* Added Extra Cloth

* added SRC to beret

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

* Empty-Commit

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-10-26 10:42:10 +01:00
Vi3trice
85353104f7 text be gone (#22929) 2023-10-26 10:39:11 +01:00
Henri215
a1206bbd89 Gives engicart a radial menu (#22922)
* Gives engicart a radial menu

* correct names

* Update code/game/objects/structures/engicart.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-10-26 10:36:30 +01:00
Sadhorizon
d3ea6b2620 Remaps the Lavaland Outpost. Again. (#22391)
* a remap begins...

* tweaks

* bye-bye, QM's handheld crew monitor

* brings back the abandoned crate

* oop

* more tweaks

* tcomm pipes

* brad update

* more firelocks

* more windows

* tweaks

* denth review part 1

* renaming doors

* crowbars

* changes walls, new locker

* Oyu's review

* more tweaks

* signs

* MAYBE will be deconflicted

* now deconfllicted hopefully

* some more tweaks

* no more wall helpers!

* fluff

* IDs for polarized windows

* slight tweaks to firelocks

* added grilles

* more tweaks

* tiny lil maint update

* more maint tweaks

* maint rework part 3

* oopsie

* jani has dark floors now

* reworked robotics, gave brad more love

* stationary defibs

* stuff

* bug fix

* more tweaks

* aaaaa

* Revert "aaaaa"

This reverts commit f70ba3a89a.

* more tweaks

* fixed scrubbers, tweaks

* should compile

* reshuffles maint loot

* request consoles + tweaks

* more tweaks

* access helper tweaks

* very minor access tweaks

* you can now pet Brad

* Update code/modules/mob/living/simple_animal/friendly/cockroach.dm

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

* renames access

* shuttle decorations + other tweaks

* oopsie

* bjam's reviews

* split the QM's locker
Exa's approval, rest of design team did not share opinions

* OH UH

* this too

* this is a better way to do it actually

* sean review + floodlight subtype

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-21 21:30:28 +01:00
Luc
046e5ced8d Transit tube hotfixes (#22944)
* hotfixes

* removes dated comment
2023-10-20 20:15:09 +01:00
Adrer
d5af86dee4 Updated HOP and QM cartridge and added new supply cartridge. (#22464)
* Updated HOP and QM cartridge and mapped instances

* Updated descriptions and apps

* Update code/modules/pda/cart.dm

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

* Update code/modules/pda/cart.dm

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

* Update code/modules/pda/cart.dm

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

* Update code/modules/pda/cart.dm

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

---------

Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-10-17 20:12:36 +01:00
Luc
744b6e3a61 Refactors transit tubes (#22452)
* Rework transit tube pods to not use timers

* please work

* yes

* henri review

* Fix mapping mishaps

* fix icon mishaps

* re-adds missing intercomm
2023-10-17 19:42:42 +01:00
Henri215
5b32ae80a9 Gives janicart a radial menu (#22688)
* janicart radial menu

* more tweaks

* Update code/game/objects/structures/janicart.dm

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-16 18:33:10 +01:00
Bjamcham
8341915cdd Swaps Atmos Tray scanners with engineering goggles (#22713)
* I am tired of hallucinations

* Trays in vendor
2023-10-09 20:42:56 +01:00
Venuska1117
21c7ada399 Add 2 new stupidly resistant wheelchairs. (#22604)
* Add stupidly strong and pain to make wheelchairs
- i dont know how to name them better tbh

* Add wheelchairs description

* Changes typos:
- Sorry but i am bad at sprites

* Sprites and slight config

* changes x_x

* Decreased times for wheelchair crafting.

* wheelchair is now typed as "wheelchair"

* peep bop sup boop bip boop beeeeeeee-
- stack amount removed, inherd good.

* skreee
no i am not vox player, but it fit for this thing perfectly.

* changes
please let it stop

* Henri requested changes
2023-10-09 20:35:07 +01:00
GDN
6df2c2e3d2 Ghost bar (#22368)
* Ghost bar initial changes

* more changes

* we ball again brothers

* we are (once again) SO back

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

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

* Update code/_onclick/hud/alert.dm

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

* Update code/_onclick/hud/alert.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

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

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

* deck of cards and shittt

* global placement

* Update code/modules/ruins/ghost_bar.dm

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

* readded

* hotfix

* zamn

* fixes

* greyfix

* last of the fixes

* can't stop me baby

* bam

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-09 19:47:17 +01: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
Qwertytoforty
73df3fcf14 Antimatter now innacurate without zooming. Sniper projectiles are faster / pass through weak stuff. (#22506)
* I should port the sniper rifle bot from blood blockade battlefront

* fuck that a

* Apply suggestions from code review

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

* variable on bullet

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-03 17:10:55 +01:00
DGamerL
0b31343cd1 Refactors the surplus crate (#22367)
* WOOOO

* We do this now

* This too

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Hmmmm not quite there

* One push

* Aight we ball

* Whoops I gotta run

* WE ARE SO BACK

* Forgor

* Now with even more Cl passing!

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Apply suggestions from code review

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

* Contra review

* Moving it to crates.dm

* Lewc Review

* Forgot about this

* Fixes contractors

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/game/objects/structures/crates_lockers/crates.dm

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

* Uh oh they are giving out too much

* Fixed TC refund

* Whoops

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Lewc review

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-01 12:58:49 +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
meow20
f3a5ef74ca Fixes runtime when clicking an empty coat hanger with empty hand. (#22577)
* prevents runtime if the hanger is clicked when its empty

* changes recommended on code chat

* Update code/game/objects/structures/coathanger.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-30 08:38:14 -04:00
meow20
fb1fd1261b Prevents alien resin from growing over chasms/lava (#22589)
* the actual fix commit

* Update aliens.dm
2023-09-30 08:25:57 -04:00
GDN
f13586300f pulse demon reopened PR (#21969)
* proof-of-concept implementation

* clear being_hijacked on death

* it glows in the dark

* oops

* machinery interactions and some fixes

* consistency, correctness, fixes

* stop usage of the \the text macro

* list inits in Initialize

* fix control flow spacing

* review compliance

* event code and some tweaks

* upgradable spell abilities and some tweaks

* how did that happen

* cycle cameras spell

* stat upgrades (no sprites for now)

* tweaking

* sounds

* jecties code

* more tweaks and fixes

* some review stuff

* alt-click user param and charger icon fix

* Remove unused default amounts in objectives

* Comply with sirryan review (part 1)

* Move isapc definition

* Add autodoc comments to all pulse_demon vars

* Give random number in name on init

* Fix merge conflicts

* Remove pulse demon from traitors on Destroy

* Fix mulebot relaymove override

* Fix airlock TGUI actions

* Fix loop over mobs in cablehop

* Attempt to fix overload runtime

* Half-fix gun cooldown issue

* Fix chat related issues

* Attempt to fix overload runtime (take 2)

* Make ion projectiles collide

* Tweak pulse demon speed

* Make demon survive loc being deleted

* Send message when saved by self-sustaining

* Fix vv_edit_var for charge

* Stop people disabling hijacked bots

* Make demon lose more health when not on wires

* Increase costs of stat upgrades

* Allow demon to change its drain speed

* Stop demon obliterating xenos

* Comply with review (partial)

* Fix issues pointed out in reviews

* Allow demon to drain charge of reachable items

* Adjust volume of demon sounds

* Improve cell interactions

* Bump up event weight (for testmerge)

* Give pulse demon a highlight section on orbit menu

* Give demon an experimental soft-counter to insuls

* Reduce volume of most common sounds (again)

* Update demon cable overlay when required

* Stop AI using its tracking ability on pulse demons

* Add wizard spawner for pulse demon

* Tweak EMP behaviour and numbers

* Clear references in Destroy

* Make appear on end of round credits even when dead

* Prevent pulse demon from detonating cyborgs

* Generalise insulated structure check

* Clean up remaining review requests

* Add new sprites

* some addressed reviews

* Typepath changes, GC fixes

* I blame charlie

* good enough

* die or something

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm

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

* even more changes

* final tweaks

* what

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

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

* bam

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

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

* to_chatn't

* deconflicted

---------

Co-authored-by: unknownuser782 <126365777+unknownuser782@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-20 16:25:13 +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
Sadhorizon
1465e5d4d3 Robodrobe and Robotics Lockers resprite (#22425)
* uniqueness

* tweak for robodrobe
2023-09-17 23:59:39 +01:00
Luc
1fe3a2187d fix icon state for depot reactor (#22449) 2023-09-17 21:02:28 +01:00
GDN
c23fb7c910 Reverts Slowdown on pulling #21056 (#21596) 2023-09-13 11:40:53 +01: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
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
matttheficus
2d455a4cbf aint this kinda funny? (#22139) 2023-09-07 10:53:16 +01:00
DGamerL
db1ed68a7d Tweaks some nuclear agent items (#22119)
* First changes

* Dont forget to do cooldown shit

* I HATE PEOPLE AAAAA

* Defib almost done

* Okay we ball

* Defib done

* I hate bullets

* Sniper done

* More stamina damage

* GDN review + Oops I forgor this

* Update code/datums/components/defibrillator.dm

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

* Disintegrate go brrrr

* Lewc review

* Ghhhhh

* Final oopsie fixed

* Almost made an oopsie daisy myself

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-07 10:52:48 +01:00
Marm
7336750e48 Paramedic QOL - Lavaland Edition (#22154)
* paramedic grindset

Adds Paramedic headset with associated encryption key. Gives Paramedic mining access+supply comms. Adds Lavaland corpse related recovery equipment to Paramedic locker.

* goodbye soul hello garment bags

Adds a Paramedic garment bag. Cuts back on Paramedic locker clutter by adding crew monitor and crew pinpointer to loadout.

* headset, i barely know her

Paramedic headset moved out of garment bag and into main locker.

* lore???

Turns out I've been spelling Nanotrasen wrong all this time.

* Update code/game/objects/items/devices/radio/headset.dm

Co-authored-by: matttheficus <57759731+matttheficus@users.noreply.github.com>

---------

Co-authored-by: matttheficus <57759731+matttheficus@users.noreply.github.com>
2023-09-01 23:19:41 +01:00
Contrabang
b99db3d3d0 Allows for easier pulling onto beds and chairs, buckling someone stops anyone currently pulling them. (#21960)
* wham-bam

* oops
2023-09-01 23:04:04 +01:00
Sadhorizon
6aefc3fa12 VIP lockers now get more spare gear. (#21957)
* VIP lockers now get more gear

* all three bags
2023-09-01 23:03:10 +01:00
HMBGERDO
6d890ca3e6 No more accidental put baton on table/in backpack (#21946)
* fixing putting baton on the table by accident

* storage items support

* storage item check tweak
2023-09-01 23:01:12 +01:00
Luc
327add6348 Converts two-handedness/wielding to a component (#21619)
* initial checkin

* Add everything but maps

* update paths

* Patches some minor bugs across twohanded things

* remove a stowaway

* Update code/__DEFINES/dcs/signals.dm

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

* Contra review

* Fix kc

* hopefully fix file perms

* Fix file perms

* revert line-endings

* uh?

* Trying once again to fix file formats

* henri review 1

* henri review 2

* update from master

* Removes override that breaks modsuits

* re-add reference

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-01 22:06:59 +01:00
Burzah
20302523d9 guest pass cant be used on personal lockers (#22045) 2023-09-01 21:49:03 +01:00
tristan1333
37c46903d0 /obj/structure/alien/egg/grown has a prox timer now (#22106) 2023-08-26 10:26:18 -05:00
Praveen Shinde
d07ca40d76 Fix: Typos with a crowbar and a sign #22033 (#22034) 2023-08-25 16:30:22 +01:00
DGamerL
85b670b599 Fixes a flowering kudzu runtime (#22082)
* Wooooo

* Lewc review

* Tiny
2023-08-25 16:15:29 +01:00
DGamerL
e83412ddd3 [s] Fixes a stupid oversight (#22100)
* I HATE PEOPLE AAAAA

* Last change
2023-08-24 23:08:49 -05:00
Qwertytoforty
76a845d380 Modsuits. Ready for review, sorry for the ammount of files changed 👉 👈 (#21147)
* biting off more than I can chew, but I feel like hurting myself

* more shit

* progress continues, moral stays sameish

* bite of 2587

* mod_theme down, but probably broken

* 385 errors, 16 warnings, zero tgui interactions

* 292 19

* final strech to buggy mess, break time

* it compiles. It almost fucking certainly doesnt work, but it compiles

* fudhsciffubgsbgpgb actions not working as should for modules

* fuck it we'll just open the pr as we work on it

* icons work now

* tgui stuff

* more progress

* JUDGEMENT

* IT LIVES. TGUI LIVES. Special thanks to Sirryan and my brother.

* jetpacks, gps, and go do what exo-suits yourself

* almost ready

* sorry to whoever has to review this

* should work™️

* should be good now

* pushing changes so I can do reviews next

* Apply suggestions from code review

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

* lore™️ Adds illegals level to modsuit parts from syndicate.

* early returns

* and these illegals

* no uplink reference idiot

* mod inhands are a good idea

* this is needed for inhands nerd

* Bomb detector working, modsutis cover ears. skin things

* overslotting removal, cyborg charging, ert loadout for gamma

* duplicated signal

* modsuit themes, removes broken mister / bad base type module, 2 cores in robotics.

* tether module, orb module, holster stuff

* built in no slip, cheaper 87

* removes modules already installed, engineer ert get jetpack, equip into modsuit storage

* comments spaces and duplicate flags

* Some adjustments and thoughts on armor, heads get guns because they are cool like that / looting command members armor

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Compile TGUI, slowdown adjustment, Modsuit to MODsuit

* sonar, do after, more equipment, acid handling

* overlay bugs / ERT / DS suits autodeploy

* middle click action buttons

* traders, sec modsuit energy nerf

* surplus weighting

* Kinesis module.

* Pathfinder module, kinesis balance, blueprint for pathfinder and kinesis

* more power / unused module removed

* name, ds fix, pre equipped to cc suit

* depot / grammer

* ok should be good™️

* overslot, dupe gun, missing suit storage

* stealth nerf, new kit

* gun stuff  / ds theme

* bio armor is gone

* let me push changes please thank you

* makes shocks work right

* copies over some changes TG made to module prices after porting

* Merge remote-tracking branch 'upstream/master' into Because-I-hate-myself-and-someone-has-to-try-it-

* sirryans changes

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

* Update code/modules/telesci/gps.dm

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

* Update code/modules/telesci/gps.dm

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

* Control define, ERT / DS have gloves / boots again.

* Apply suggestions from code review

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

* More changes

* god I hate tgui. Why do all the bundles live underground, instead of in my basement?

* she updates my master till I testmerge

* modsuits can recharge again

* fixes a lot of shit

* Ready for TM probably

* sure fuck it whatever that makes sense I guess

* the pinpointer works better™️

* Another storage module bug fix

* hair and medical stuff

* fuck fuck fuck

* fixes sonar

* Bag exploit fixes / plasma runtimes / ear nerf

* dna lock improvement / cryostorage

* whoops

* Ball form second cooldown wasn't helping, no more infinite cores

* she springs my lock till I ***SNAP***

* plasmaman no longer die

* fixes modsuit emp issues

* atmos no longer fucking dies

* Fixes, module printing, and a restriction on newly constructed modsuits

* Inventory code my hated

* WOOO PREFERENCE CODE WOOOOO

* icons my hated

* fix for mods / spaceproof shit

* holy shit whhhyyyyy

* backpack first

* Update mod_theme.dm

* prevent infinite gun arms / infinite modsuit cores / syndicate modules

* fixes tm error

* scream loudly if species sprites break. They shouldn't, but, you know.

* deconflicted with luck

* converts to refit for species

* fix pathfinder

* fixes modsuits being funky power wise

* lockboxes :gatto: , as well as DN-MP shield lock, and slight nerf to atmos modsuit

* nerfs the atmos modsuit

* magboots for ds / CC modsuit

* downside of autosave: typing in wrong window saves bad stuff

* Gamma ERT have internal cameras again.

* spellcheck when

* ah fuck

* yes delete the null that works

* whoops

* fixes error / description

* un vulps your cannon

* fixes tails disapeering on base modsuits

* space to underscore

* tgui fix / tajaran

* springlock buff, cryopod fix

* u helps

* WHO PUTS A GUN IN ITEMS

* tgui moment

* mining modsuit nerf / hidden holster module

* PAIN

* UNATHI TIDE STATION WIDE

* I love special code

* slightly dense

* shark jumpscare

* fixes ghost item, fixes springlock being bad

* YIPPEEEE IT WORKED

* she decons my flict

* pain

* ebbas days are numbered :^)

* hidden

* r-r-r-ebuild

* fixes more bugs

* qwerty, you are dense

* fixes gps

* fix mulebot crate

* level fix

* adds back icon

* moving storage, fix bug, modules activate / deactivate message

* yeah

* yeah

* yeah™️

* steels requests

* windoors no longer make pathfinder module explode

* chat spam

* oil slicks + modsuits

* whoops

* bag check

* ofc

* Update code/modules/mod/mod_control.dm

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

* Apply suggestions from code review

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

* Update code/datums/uplink_items/uplink_nuclear.dm

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

* Update code/modules/mod/mod_control.dm

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

* Update code/modules/mod/modules/module_pathfinder.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-08-19 15:36:13 -05:00
Qwertytoforty
aad8529c24 Removes swiftness, add speed potions back as oil slick potions (#20939)
* Removes swiftness, add speed potions back as oil potions

* no shorting, icon update on mob

* early and forgotten returns

* ramon oil colours

* Update code/modules/research/xenobiology/xenobiology.dm

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

* no more slipery vehicles, now slippery tables

* just because it compiled the first time doesn't mean the second list will compile idiot

* icons my hated

* bottle4

* cleaner up

* qwerty my man what you doin: s34n 2023

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-16 21:07:39 +01:00
Venuska1117
3db565f553 Add Railings "Caps" for Aesthetic Use. (#21803)
* Add railing caps
-subtype of railing corners

* Batch of changes:
- Fixed cap sprite
- Added 2 more instances of caps (left and right)
- Added caps to rods crafting menu
- Changed cost of corner from 3 to 2
- Added cost to cap, it cost 2 rods

* Woops:
- Apparently railings corners and such borrow code from normal railing so they always drop 3 rods.

* Change railings to list

* removed density/climbable
- they inhert it from railing
2023-08-16 19:58:57 +01:00
warriorstar-orion
124f222ec0 feat: clicking on wallmaps prompts to open webmap (#21840) 2023-08-12 18:23:38 +01:00
Contrabang
b1eda77f01 Adds happiness (a new chemical) (#21718)
* Adds happiness

* epic linter fail

* epic comma fail

* fuck i forgot to change the name

* deconflict it PROPERLY

* jimkil review
2023-08-12 18:22:18 +01:00
Divulf
be0cd179d3 Adds 5 mannitol pills to the psychiatrist's pill bottle (#21557) 2023-08-11 15:36:53 +01:00
Henri215
32132e4274 Hooking someone on a meat spike is now logged (#21857)
* Hooking someone on a meat spike is now logged

* Could use this? idk

* Checking for client

* mind is better

* Update code/game/objects/structures/kitchen_spike.dm

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

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-07-29 17:09:19 -05:00