Commit Graph

90 Commits

Author SHA1 Message Date
Burzah d8393fcf79 Removes duplicate code from ERT RED Medic (#21161) 2023-06-02 19:28:47 +01:00
Qwertytoforty b6ddedd71c Engi ERT now get hardened wireless interface implants (#21119) 2023-06-02 18:17:19 +01:00
Qwertytoforty 2517851800 Nerfs laser rifle ammo size and emp proofness. (#21082)
* Nerfs IK ammo size and emp proofness.

* description / emp

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

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

* Update code/modules/projectiles/projectile/beams.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-22 22:25:03 +02:00
GDN 73269c0527 forcemodule fix (#21009) 2023-05-11 11:50:59 -05:00
Coolrune206 2478724a09 tourte is knocking on my window requesting stuff (#20693) 2023-04-22 09:17:17 +02:00
Burzah e85094ed32 ERT Medkit Revision (#20658)
* Update code/modules/reagents/reagent_containers/pill.dm

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>

* Seperated the Red and Gamma Patch Packs
Changed some colors for the patch packs/pill bottles

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

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

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

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

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

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

* adjustments to patch packs

* format fix

* inheritance adjustment

* adjusted medince to reflect changes to SR

---------

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-04-15 21:59:19 +02:00
Henri215 5c9d20f65f Ports the Bluespace Light Replacer from BeeStation (#20545)
* Ports the Bluespace Light Replacer from BeeStation

* advanced replacer for janitor ERT

* wrong place

* Preventing it from being used over cameras

* Update code/game/objects/items/devices/lightreplacer.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* bluespace replacer only for gamma

---------

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2023-03-22 22:22:19 -05:00
Burzah 2e61752525 adds death alarm for RT Jani Red (#20639) 2023-03-19 17:10:00 -04:00
Burzah 30e461f60a Ert medic kit rework (#20561)
* First commit for ERT medic kit rework

* Value adjustment for pill bottles and patch pack
This was intended for the first commit

* removes the empty containers previously created

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

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

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

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

* Merge conflict resolution

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-03-13 22:53:47 +01:00
Burzah 0bf9739346 Medical ERT Soap (#20493) 2023-03-13 21:51:55 +01:00
S34N 9b260c4611 adds wire interface implant (#20482) 2023-03-04 09:56:06 +01:00
Henri215 1ce593b9a2 Ports TG push broom (#20367)
* Ports TG push broom

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

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

* Apply suggestions from code review

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

* Lewc review and twohanded autodoc

* Steelslayer review

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-02-25 12:15:21 -06:00
Henri215 c4667311e7 Janitorial equipment tweaks and cleaners availability (#20037)
* Janitorial equipment tweaks and advanced cleaner

* cleaner availability tweaks

* old cleaner for drones

* Mop capacity buff

* advanced cleaner for sol traders

* conflict part 1

* Merge branch 'master' into janitorial_tweaks

* Revert "Merge branch 'master' into janitorial_tweaks"

This reverts commit 47129ea819.

* Revert "Revert "Merge branch 'master' into janitorial_tweaks""

This reverts commit a8c520b069.

* hahahahaha

* hahaha part 2

* hahaha part 3

* cerestation edit

* adv cleaner comes with 500 now and ERT belt

* lube spray upper case and moving it to spray.dm
2023-02-03 13:10:51 -06:00
Qwertytoforty b90bb7bcb8 ERT / nukies can now choose any NON KARMA species (#20032)
* ERT / nukies can now chose any NON KARMA species

* hahah yeah better fix that from testing

* warning people about implant destruction

* spritare

* random species option

* 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>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-01-20 19:22:29 -05:00
warriorstar-orion a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
Bm0n 4bb0eb822d Ports TG ID cards (#19807)
* new ids!

* tcomms fix for ERT

* as above

* star for ERT commander

* Syndie commander ID gets a star instead of crown

* fixed TDred ID card

* cmag tweak

* pda id overlay

* whoops i fucked up shaftminer

* first pass

* jobs_centcom

* SHHHHH

* WHY DO YOU HAVE GLOVES?
2022-12-24 18:15:49 +01:00
warriorstar-orion 77f576a5ca Recategorize in-game announcements by priority. (#19639) 2022-12-19 17:02:22 +00:00
Coolrune206 0ea9d9d6e2 gives the gamma med ERT a toxins medkit (#19775) 2022-11-29 12:46:58 -05:00
S34N 667dd5d4ac 515 Compatibility (#19636)
* 515 compat

* double spaces

* Callback documentation, aa review

* spacing

* NAMEOF_STATIC

* big beta
2022-11-08 23:08:40 +00:00
warriorstar-orion 12c873d816 Fix human appearance randomness in spawners. (#19561) 2022-11-03 17:59:30 +00:00
ElorgRHG e843567671 Clothing (jumpsuit) DMI split, unused jumpsuit sprite purge along the way (#19092)
* Medical and RnD DMI files split

* Cargo DMI split

* Security DMI split

* Engineering DMI split

* Captain DMI split

* Civilian/service DMI split

This one hurt

* Forgot about this one

* Color DMI split

* Purges everything that was delted up until this point

... with a blindfold and a shotgun

* Dress and suit DMI split

* Pants and shorts DMI split

and merges pants and shorts files... shorts are pants, right?

* Donator/fluff jumpsuit clothing organisational relocation

* e

oops

* So this is used, repath bad

* Random commit

* Costumes DMI split and jumpsuits purge

* Some fixes

* pennywise

* Centcom DMI split

* SolGov DMI split

* Retro DMI split

* Syndicate DMI split

* Misc DMI split

* centcom officer

* Kills off uniform.dmi completely

* last fixes

* lastest fixes

* vox navy gold conflict

* civilian barber

* Tourist observers work now

* Hopefully working non-human humanoid clothing

* This being in suit.dmi is one of the reasons I made this PR

* This shouldn't be here

* Late night coding

* Pun Pun regains his drip

* Last fixes

* security/OFFICER

* Most important - clown fix

* working subtypes good

* Fixes chameleon jumpsuit

* Proper QM pathes

* Fixes jumpsuit rolling with the power of poor quality code

* Cargo tech character setup fix

* else instead

why didn't I do this in the first place

* PURP

* Fixes broken character setup job clothing

* CC suit fix

* Psychedelic jumpsuit proper path

* You must wear the jumpsuit to adjust it
2022-10-09 14:24:10 +01:00
Marm 6d1876a0fd Reworks CNS Implant + Emagged Upgraded Cybernetic Heart (#18202)
* just dodge

Changes all instances of anti_stun to anti_stam in the code in relation to the CNS implant. Reworks the CNS implant to protect against large bursts of stamina damage. Reworks the emagged upgraded cybernetic heart to cause the user to regen stamina passively. Disabler shots can now cause the emagged upgraded cybernetic heart to fail, causing heart attacks. Removes emagged upgraded cyberheart's ability to negate drowsiness and sleeping. The upgraded cybernetic heart now makes a passive heartbeat noise, much like the cursed heart.

* dodge dodge revolution

Lowers chance of heart attack. Removes audible heartbeat.

* boxed emp kit

* elaboration

* Update code/modules/surgery/organs/augments_internal.dm

Sure

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

* Update code/modules/surgery/organs/augments_internal.dm

Why not?

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

* i finally got around to it

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-07-19 17:46:25 +01:00
S34N 1ad219e02a Revives "Updates ERT gear and adds holo stretcher #16266" (#18139)
* Updates ERT gear

* Apply suggestions from code review

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

* Reformats new vars

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

Code Clarity

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* Removes unneeded item

* BULK

* repath time

* moxian review

* le beds

* haha webedits

* bubble review

Co-authored-by: warior4356 <warior4356@yahoo.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2022-07-05 18:47:20 +02:00
S34N 5f58a80d8a Let admins allow ERT borgs to choose sec modules (#17874)
* Let admins allow secborgs in ERT

* dont force them to be secborgs

* fixes up some logic

* remove this

* Update code/modules/tgui/modules/ert_manager.dm

* le indent

* deconflict

* tgui deconflict

* Update code/modules/tgui/modules/ert_manager.dm

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-06-25 00:07:18 +01:00
Farie82 8001f1ec04 Refactors the mind.original variable into non reference variables. Improving player mob GC (#17219) 2021-12-16 18:30:21 +01:00
Fox McCloud 06df88706f Beginnings of Combat Changes: Ranged Weaponry (#17075) 2021-11-11 21:24:02 +01:00
lewcc f4c69a3cff Hardens ERT nutrient implants 2021-10-09 15:49:44 -04:00
E-MonaRhg 4ee75ce29d Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-27 16:37:58 +02:00
variableundefined e788278f57 Merge pull request #16397 from Sirryan2002/ERTFix
Jani ERT Equipment Tweak
2021-07-26 20:37:03 -04:00
variableundefined 0b7e40d78c Merge pull request #16395 from Qwertytoforty/old-reliable
Better equips med ERT for the basics
2021-07-26 20:36:09 -04:00
Sirryan2002 850ce3f12c adds nv to jani gamma 2021-07-20 14:36:15 -04:00
Sirryan2002 6b6b9a68da Jani ERT Equipment Tweak 2021-07-19 16:28:31 -04:00
Qwertytoforty f9d00d8df3 Better equips med ERT for the basics 2021-07-19 11:19:12 -04:00
E-MonaRhg c303a2b3f2 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-09 00:03:38 +02:00
AffectedArc07 c7fd6681a1 Gamemode configuration 2021-05-16 15:15:05 +01:00
ppi13 9a582679f1 Gives ERT Combat Gloves (#15879)
* Gives ERT Combat Gloves

* Removes pasta
2021-04-20 21:50:17 +01:00
E-MonaRhg 7b342f4476 Hey, that compact defib thing is pretty cool, what if we had three? 2021-03-31 22:34:17 +02:00
AffectedArc07 f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloud 75935ff876 Converts Eye Augments to Cybernetic Eyes (#15519)
* Converts Eye Augments to Cybernetic Eyes

* literally not used

* it helps when you properly include all the code

* flashlight eyes

* tweaks

* conflict resolution

* can't have two eyes

* order of operations matters here

* autosurgeon
2021-03-03 20:21:30 +00:00
AffectedArc07 f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
Fox McCloud 003a1f7cba Tank Refactor; Breathing Retool (#15371)
* Tank Refactor Breathing Retool

* missed maps and doc

* just in case
2021-01-28 20:57:37 +00:00
Fox McCloud de795c4e31 Radiation Refactor (#15331)
* First Commit

* visible radiation and engine goggles

* correction

* t-ray fix

* further adjustments and fixups

* gieger addition and cleaning fixup

* yet more fixes

* styling fixes

* fixes

* human glowing fix

* do the merge conflict avoidance dance

* Update supermatter.dm

* supermatter rads

* mapping in

* radiation doors

* yeah yeah line endings

* clean up

* styling issues

* showers
2021-01-24 22:03:13 +00:00
dearmochi 14e9e92508 Sets ERT's offstation_role to TRUE (#15282) 2021-01-20 09:59:54 +00:00
Darkmight9 c456b89952 Gives Red alert jani ERT improved jani arm implant, gives the mop implant to amber jani ERT (#14928) 2020-12-16 14:59:03 -05:00
Qwertytoforty f125a501a4 Gives red and gamma (just gamma for janitor) death alarms (#15103) 2020-12-16 14:01:43 -05:00
Qwertytoforty 47176c0a14 Makes red ERT use the proper hardsuit (#15003) 2020-12-09 11:53:36 -05:00
AffectedArc07 54dd2765b4 Converts all tgui_ to ui_ 2020-11-21 12:10:58 +00:00
Kyep f5a1a359a1 ERT Commander Rework (#14640)
* ERT Commander Rework

* instant = TRUE

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-10-21 09:44:37 -04:00
TDSSS 328b7fa8d8 ERT idiotproofing and minor tweaks (#13834)
* makes ert more robust

* renamed and tweaked

* idiot proofing of ert

* I cannot into git, oops

* removed the anti-stun from code red erts again

* removed implied src
2020-09-16 16:38:25 -04:00
AffectedArc07 2e29a1ddcb Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14190 2020-09-15 20:46:10 +01:00