Commit Graph

26529 Commits

Author SHA1 Message Date
Daylight
1077514713 Changes the gamma alert announcement wording (#23592)
* rewording

* Validhunting bad
2024-01-09 12:49:00 +00:00
datlo
2600ce60f6 Fix syndicate MMI message spam (#23583) 2024-01-09 12:48:11 +00:00
Contrabang
c904802fed Fire extinguishers no longer lose their examine description after being used. (#23570)
* more bad extinguisher code

* guh

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

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

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

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

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

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-01-09 12:47:44 +00:00
Octus
c64b93e8bd lol lmao even (#23738) 2024-01-08 15:38:05 -08:00
Pierre-Louis
e8d2b06d6f Allow MODsuit storage Bag (ShiftB) keybinding (#23629)
* Fix MODsuit storage keybinding issue

Resolved issue where Shift + B key combination did not put items into MODsuit storage. Updated the quick_equip_item method to handle MODsuits and allow items to be inserted into MODsuit storage using key bindings. Therefore Fixes #23152.

* return messages (of errors and confirmation)

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

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

---------

Co-authored-by: Pierre-Louis <hernandezpierrelouis@protonmail.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-01-08 15:17:15 -08:00
Qwertytoforty
d668a29a60 Ports (most(ok like half)) station traits from tg. Ready for review into TM (#22334)
* no longer super sick time to port station traits in a 4 hour rush as you have lost control of your life

* some changes /fixes

* Apply suggestions from code review

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

* more changes

* oh right, the murders (uplink price tweaks)

* Update code/controllers/subsystem/SSjobs.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>

* compiles

* doesnt work but works better

* tgui dogs still sleep but I want to sleep

* it should finally compile now. Probably.

* Update tgui.bundle.js

* Sorry IAN, transfer components is shoddy as hell

* removes minor uneeded /tgui

* also extra line whoops

* final stuff

* reverting changes I made earlier is hard ok

* Weight change, uplink reference

* oh right, the hey fucko

* Update code/_globalvars/traits.dm

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

* Update tgui.bundle.js

* pushes

* pulls it

* Apply suggestions from code review

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

* more changes, ion rifle blocked on cyb revolution

* dipshit remove the debug / tgui pritier and such

* tgui

* updates tgui again as nanomap was merged

* Apply suggestions from code review

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

* comment / tgui

* every day I worry all day

* Full TGUI rebuild + prettier

* ah fuck

* leave a customer feedback at the link below!

* tgui momenr

* tgui moment

* FUCK I am dumb

* vertical TGUI

* She T's on my GUI till I

* Update tgui.bundle.js

* Apply suggestions from code review

Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>

* Update code/modules/supply/supply_pack.dm

Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>

* IPC can now use robotic hearts / pulse demon hearts and charge

* fixes revert not working for hangover / arrivals

* tgui moment

* hhgreg

* fixes that one bug

* Every day I worry all day

* deconflicted for real this t ime

* Update code/datums/station_traits/postive_traits.dm

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

* ch-ch-ch-changes

* Update SSjobs.dm

* Update code/modules/supply/supply_pack.dm

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

* deconflicted but won't pass CI

* fixes double dipping on traits

* my le consoles, they le no work?

* Great Great Asset, Asset, Great Great Asset, Asset...

* sorry slime mains

* fixes borgs being punished heavier

* actually fixes it, I was dense

* hopefully fixes borg drunk further

* makes it compile?

* actually makes it compile god whyyyy

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@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: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
2024-01-08 19:07:09 +00:00
Rerik007
2c7a9b3078 Prevents pushing the person wh() is pulling you (#23746) 2024-01-08 16:25:20 +00:00
Qwertytoforty
44cde7c753 blackbox logging for biohazards (#23309)
* blackbox logging for biohazards

* guh it warned for the others but not this one

* Update code/__DEFINES/misc_defines.dm

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

* define / lewc

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-01-06 23:45:43 +00:00
Aylong
37879c530b Boxes new sprites & little refactor (#23213)
* Sprites and little refactor

* idk what i am doing

Maybe refactor

* Sort the boxes

* Matches path

* Script and maps

* Okay... that was a strange decision.

* bathroom parts box

* More boxes

* Henri review changes

* Update toy.dmi

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

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

* Update storage.dmi

* Update boxes.dmi

* True conflict solve

I hope

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-01-06 23:31:36 +00:00
BiancaWilkson
95c86c5bfc Converts no slip into a trait (#23140)
* makes noslips work

* trait part

* THE REST

* it didnt conflict too much actually

* this was intended, whoops lol

* no more processing

* consistency

* lewc review

* Apply suggestions from code review

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-01-06 23:29:10 +00:00
DGamerL
1a29419228 Test time (#23734) 2024-01-06 23:18:23 +00:00
DGamerL
382a71df0d Renames all typepaths + names of implants to biochips (#23172)
* The fix

* Contraaaaaa

* Fixes CI

* Fixes the pads + cases

* Uplink datums

* Update code/datums/mind.dm

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

* Update code/__HELPERS/unsorted.dm

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

* Update code/modules/research/designs/medical_designs.dm

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

* Update code/modules/research/designs/medical_designs.dm

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

* Update code/modules/research/designs/medical_designs.dm

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

* Update code/modules/research/designs/medical_designs.dm

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

* Update code/modules/surgery/implant_removal.dm

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

* Outfits now use a proper variable name

* Fixes surgery (oops)

* More .dme changes

* Renames the folder

* Fixes bad merge

* Contra review

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

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

* Fixes CI fail

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-01-06 23:15:55 +00:00
DGamerL
fad6509b5e Removes most hardsuits from the code, replaces with MODsuits where appropriate, alongside a small sprite cleanup (#23652)
* TODO: ERT HARDSUITS

* Drask and Taj

* Unathi, Vox and Vulp

* Last things

* Hats off to you

* Fixes a dumb drask corset issue
2024-01-06 23:04:33 +00:00
Octus
e91dce3ee7 TG Double Examine (#23477)
* nice

* Apply suggestions from code review

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

* Update mod_control.dm

* fixes and modsuit fix

* Apply suggestions from code review

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

* think i did it right

* Apply suggestions from code review

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

* Update code/__DEFINES/mob_defines.dm

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

* Update atoms.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-01-06 22:30:38 +00:00
Yata9arasu_alt
0ba861d0b1 IPC wont lose their hair after death (#23627) 2024-01-06 21:58:22 +00:00
Venuska1117
75f3a51eaf Metastation: Maintenance Rework [Part 2] (#23164)
* half-done, saving...

* stage for conflicts

* addin that paper for later use

* stage

* remove copy

* added vent in old freezer

* Fixing that paper.

* that damn lattice

* Batch of fixes:
- Added APC to captain bedroom, because CI check want it.
- Changed xenobio test chamber to "special containment" and renamed related things so it now fit theme, admins can make events of "containment" or related (or store cling there)
- Added missing APC to abandoned library, so now maintenance is powered.
- Moved Vent in old laser tag room, so it dont cause FAIL on check.

* FIX "d" variable error
- i hope it will work

* Changes:
- Laser tag room is gone, now its just some ordinary maintenance area.

* Added fungus and web to previous edit.

* Removed sheet bag

* Added missing APC

* Removed duplicated APC.

* changes requested from henri

* Goodbye tsunguska, welcome bull- i mean stuff.

* SPAAACIIING

* Did 95% of requested changes by S34N
- i am still confused about this first botany door, oryginaly it dont have access on it.

* Did 80% requested by Aylong220
- Discussion was on discord about changes, cannot do some of them.

* that APC
2024-01-06 21:54:28 +00:00
Deniz
17201fea24 rename + file (#23653) 2024-01-06 21:53:05 +00:00
Contrabang
0f53ced317 ai mind (#23651) 2024-01-06 21:52:06 +00:00
Octus
0952977020 mhm (#23642) 2024-01-06 21:51:06 +00:00
PopeDaveThe3th
16e000e549 Redspace Purge (#23641)
* The Green Terror marches on

* Update code/datums/spells/construct_spells.dm

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

* Update code/game/gamemodes/cult/cult_structures.dm

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

* Updated Icons

* one extra i forgor

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-01-06 21:50:26 +00:00
Christasmurf
1e93bf7408 alloweditems (#23637) 2024-01-06 21:49:58 +00:00
Qwertytoforty
b10dd15a2f oops (#23631) 2024-01-06 21:49:43 +00:00
Qwertytoforty
150d73648c remind me never to add a food item again (#23607) 2024-01-06 21:47:44 +00:00
PopeDaveThe3th
144f2e9b89 Adds Two Soap Crates (#23606)
* adds soap crates

* qwert suggestions
2024-01-06 21:47:25 +00:00
Christasmurf
cae6017c48 Bomber Jacket resprite + departmental expansion (#23599)
* bomberjackets

* Apply suggestions from code review

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

* minor changes to armour and allowed items

* secbomber description change

* more allowed item tweaks

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-01-06 21:46:14 +00:00
Pierre-Louis
73d50f9f8d Add immunity to ash storm for possessed objects and swords (#23596)
* Add immunity to ash storm for possessed objects

Fixes oversight #23110 by adding immunity to ash storm for possessed objects, addressing the bug where possessed objects, including possessed swords, were not immune to ash storm.

* Make possessed sword immune but not objects

* Code improvment. Both possessed sword and objects now immune

* Ash immunity on children inherited "sword" subtype only

Oopsie

* Fix

---------

Co-authored-by: Pierre-Louis <hernandezpierrelouis@protonmail.com>
2024-01-06 21:45:54 +00:00
Mitchs98
10f3d6aac3 Clown cake can now be sliced. (#23591)
* caek

* caek 2
2024-01-06 21:45:35 +00:00
Christasmurf
420ca55093 fix (#23587) 2024-01-06 21:45:01 +00:00
Daylight
7caf286dd9 Replaces the ghost role alert ping with an unique sound, and decreases ghost window highlight spam (#23586)
* A commit

* Make it louder

* Golem flash cooldown
2024-01-06 21:44:47 +00:00
Pierre-Louis
a432beb4d3 Fix Reactive Repulse Armor no longer yetting spectators (#23580)
* Fix issue with Reactive Repulse Armor affecting spectators

Ensure that Reactive Repulse Armor does not affect spectators by adding a check for ghost entities during repulsion action.
Fixes #23574

* Fix camera mobs getting thrown too

---------

Co-authored-by: Pierre-Louis <hernandezpierrelouis@protonmail.com>
2024-01-06 21:44:26 +00:00
Contrabang
c1a37d4868 PDA ringtone input is now trimmed (#23579)
* bam

* oops
2024-01-06 21:43:48 +00:00
BiancaWilkson
1267ad92f0 Antag contractees no longer have an increased timer, contractees now are guaranteed to get injured. (#23533)
* everyone gets more injured always!

* this is why i leave myself notes

* no escaping the beating

* jail for 1000 years

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

* gone

* cleans uo the default_damage procs a bit

---------

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
2024-01-06 21:42:02 +00:00
BiancaWilkson
2140320fc8 Reworks the effects of brain damage (#23343)
* start

* now based on percentage of Brain Health

* minor case of major brain damblage

* 4

* move a bit around + adding stumble

* i really do not like these

* i was in a silly goofy mood

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

* more jittery

* Span fix

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-01-06 21:36:40 +00:00
Qwertytoforty
27af5eca53 makes make everyone random not the worst button of all time (#23703)
* makes make everyone random not the worst button of all time

* comments
2024-01-02 15:29:09 -08:00
Deniz
3570756619 cleanbot typecache init (#23689) 2023-12-31 13:49:57 -05:00
DGamerL
afef6a1156 Nice (#23691) 2023-12-31 10:35:46 -06:00
Ordosian
8893663d4b More Diona Hair (#23565)
* New Diona Hair

Ported from Aurora Station

* Fixed Glasses on certain hairs

* Minor Icon Change

---------

Co-authored-by: Ordosian <Ordosian@gmail.com>
2023-12-31 10:33:33 +00:00
Octus
50d2707982 The Glorious Vox Resprite (#23502)
* start

* more

* tail static

* tails work!

* adds crimson

* last colors

* done
2023-12-31 10:26:23 +00:00
Nathan Winters
dad3774e7b Buffs the Virus Outbreak event (#23285)
* Spring cleaning

* The great virus reclassification

* Add severity comment to Fake GBS

* Fix Jungle Fever being uncurable

* Fix Shock causing fainting slightly too often

* Makes Brainrot kill more reliably (yes, it already did)

* Make Wizarditis replace clothes a bit less eagerly, cleanup

* Buff Wizarditis effects' probabilities

* Add a bit of variety to Wizarditis flavor messages

* Clean up, nerf, and add some variety to Lycancoughy

* Refactor Spanish Inquisition Flu

* Refactor and slightly rebalance ICE9 Cold

* Fix DROPDEL items not GCing properly sometimes

* Lightly overhaul Pierrot's Throat

* Remove unnecessary `null` declaration assignment

* Deduplicate Critical disease properties

* Spring cleaning 2: Electric Boogaloo

* whoops

* Fixes DROPDEL items not GCing properly someothertimes

* Make Wizarditis clothes DROPDEL too

* Lewcc review

* Deduplicate Pierrot's Throat symptoms

* Spread out Cold9 and Spanish Flu's damage

* Clean up Adv. Kingstons

* Fix Adv. Kingstons *healing* brute damage
2023-12-31 10:21:45 +00:00
PollardTheDragon
69a49cfe18 Ion Storm Event - Laws Updated (#23278)
* Laws Updated...

* Laws Updated Again

* Grammar

* Tab Fix

* More Ions ...Laws Updated.

* Fixed Indentation, Static

* Removed static from Laws list

* Laws updated - fixes, added three more

* Spellcheck

* Spacing Fix
2023-12-31 10:20:12 +00:00
Deniz
c49f362039 Yet another bots refactor (#23162)
* initial test commit

* 2nd stage

* hull breach bug found

* 3rd small

* Master Merge

* fml

* one more time

* Merge failed incredibly bad, except commits

* 4th small

* 5th - Hull breach auto/replace tile bug fixed

* sleep

* avoid to avoid_bot

* indentation

* get_turf()

* even more comments

* Define edits

* eat tile order edit

* ui goes big

* Minor edits

* suggestions

* S Floor

* S Weapons check

* review

* I dont want TGUI on this

* Missed one

* review IF

* Returned the Return

* if error

* mode ==

* Reviews, Ty contra

* we shall NAG

* review

* Reviews

* Oppsie fixed

* tgui typo*

* TGUI Backend *fixed*

* Revert tgui backend edit, oopsie, small text edits

* Reviews

* emag autodoc + else if hateboner

* revert a change, non relevant

* undef

* revert tgui window size edit

* cleanbot cleanable list

* minor edit

* Review isspaceturf

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

* List

* Emagged 1/0

* Cleanbot list edit

* emagged 1/0 2

* removed comment

* emag_act revert

* didnt commit?

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-12-31 10:18:31 +00:00
Christasmurf
95c46662c5 Entertainer Drip (Mime/Clown) (#23546)
* entertainerdrip

* duffelshadingitem
2023-12-28 22:39:36 +00:00
SteelSlayer
3f5c57b786 Runtime and GC fixes related to orbit UI bluescreens (#23512)
* GC and runtime fixes

* BONUS FIX!
2023-12-26 14:49:37 -05:00
Pierre-Louis
19cc5e166b Added the Janicart to the available list of supply pack (#23456)
Added both the Janicart and the keys to the supply list in the miscelleanous part.

Co-authored-by: Pierre-Louis <hernandezpierrelouis@protonmail.com>
2023-12-26 14:46:23 -05:00
Daylight
27722e4d7a Trying to talk with oxygen damage makes you whisper instead of gasp (#23425)
* Basics working

* The rest of the PR

* formatting suggestion

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

* Renames proc

* Darn merge conflicts

* Rename proc again

* this doesn't do anything

* I swear I commited this earlier. Grammar fix.

* Behold, the code compressor 9000!

Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>

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

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-12-26 14:45:50 -05:00
Qwertytoforty
70346d2a65 a a hole (#23613) 2023-12-26 14:24:42 -05:00
Qwertytoforty
b678d0289d Kidan, drask, and greys can be ERT now (#23552) 2023-12-26 13:27:16 -05:00
DGamerL
20ec46b0ca At least this was caught now (#23563) 2023-12-26 13:26:27 -05:00
Daylight
501fe33634 You don't need to be unconcious to succumb anymore (#23460)
* Ded

* Deconflicts with #23441
2023-12-26 12:59:02 -05:00
AffectedArc07
266e15ee40 Upgrades TGS DMAPI to 7.0.0 (#23657)
* Upgardes TGS DMAPI to 7.0.0

* Fix spacing

* For this
2023-12-25 19:48:21 +00:00