-
Notifications
You must be signed in to change notification settings - Fork 64
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Deforest Medical Cargo Company Update | Not so free healthcare | Medb…
…ay watches in horror as assistants overdose themselves on dollar store medpens (#24771) * injectors of various types * adds a timer to injecting others with the pens * fixes some of the stuff * fixes the do after * replaces the old pens and chems with the new ones in the company * fixes that too * fixes injector icons * gives all of the pens a slight debuff chem so its not all upsides * stack items and prepacked medkits * as usual, bug fixes * makes those names different * stops accidentally overriding multiver pill bottles * sprites for bigger bags, mob sprites soon to come * big medkitted all over the place * removes unused check * should fix tests * removes a single conceptually stupid injector * changes a few thing saround * nerfs pentibinin * adjusts a few of the pens to be a bit better and or worse * fixes the wearable medkits not being to carry the things they spawn with * makes the orange wearable unzip faster and slow down less unzipped * buffs the bags by allowing belt usage * puts the tiny wound analyzers in some of the medkits * lets the splint work on muscle issues, changes the sound a bit * tweaks worn sprites of and gives inhands to wearable medkits * removes debug message * adjusts some numbers and docs * adds some of the kits to cargo so medbay can order in bulk * adds some of the medical stuff to opfor as well * gives all the medkits unique inhands * tweaks a lot of the stuff (pickup sounds wahoo!) * adds a little more to using the instant wound healing kits * adds tox damage to twitch overdose so you cannot become fucking invincbl * makes the comment style more similar across the code * lets the frontier kit be hooked onto belts + owrn sprite for it * makes the bandages not get ruined by bleeds as fast * Update code/__DEFINES/~skyrat_defines/opposing_force_defines.dm Co-authored-by: GoldenAlpharex <[email protected]> * Update code/__DEFINES/~skyrat_defines/opposing_force_defines.dm Co-authored-by: GoldenAlpharex <[email protected]> * makes the big surgical kit come stocked * Update modular_skyrat/modules/deforest_medical_items/code/chemicals/demoneye.dm Co-authored-by: GoldenAlpharex <[email protected]> * reviews for some of demoneye * Update modular_skyrat/modules/deforest_medical_items/code/chemicals/demoneye.dm Co-authored-by: GoldenAlpharex <[email protected]> * Update modular_skyrat/modules/deforest_medical_items/code/chemicals/demoneye.dm Co-authored-by: GoldenAlpharex <[email protected]> * makes the demoneye organ damage list static * Update modular_skyrat/modules/deforest_medical_items/code/chemicals/twitch.dm Co-authored-by: GoldenAlpharex <[email protected]> * more review stuff * reviews for the injectors * Update modular_skyrat/modules/deforest_medical_items/code/storage_items.dm Co-authored-by: GoldenAlpharex <[email protected]> * Update modular_skyrat/modules/deforest_medical_items/code/storage_items.dm Co-authored-by: GoldenAlpharex <[email protected]> * updates the civil defense kit's sprite to be a bit better * formats the cargo packs a bit nicer * fixes a slight logic error * fixes an erroneous comment * makes the big surgery kit able to hold, and come with a rollerbed * moves that static list a bit * fixes first responder surgical kit's left inhand * makes the combat surgeon kit not missing sprite when worn * makes the rapid wound fixers actually get used, reworks medkits slightly * messes with the big surgical kit AGAIN * makes demoneye need stable plasma to cook to stop conflicts * Update modular_skyrat/modules/deforest_medical_items/code/storage_items.dm Co-authored-by: sqnztb <[email protected]> * Update modular_skyrat/modules/deforest_medical_items/code/storage_items.dm Co-authored-by: sqnztb <[email protected]> * Fixes the trait that had to be moved! * fixes demon-eye colors and twitch afterimage length --------- Co-authored-by: GoldenAlpharex <[email protected]> Co-authored-by: sqnztb <[email protected]> Co-authored-by: GoldenAlpharex <[email protected]>
- Loading branch information
4 people
authored and
FFMirrorBot
committed
Nov 26, 2023
1 parent
1251486
commit e858e93
Showing
23 changed files
with
1,385 additions
and
144 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
modular_skyrat/modules/deforest_medical_items/code/cargo_packs.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /datum/supply_pack/medical/civil_defense | ||
| name = "Civil Defense Medical Kit Crate" | ||
| crate_name = "civil defense medical kit crate" | ||
| desc = "Contains five civil defense medical kits, small packs of injectors meant to be passed out to the public in case of emergency." | ||
| access = ACCESS_MEDICAL | ||
| cost = CARGO_CRATE_VALUE * 10 // 2000 | ||
| contains = list( | ||
| /obj/item/storage/medkit/civil_defense/stocked = 5, | ||
| ) | ||
|
|
||
| /datum/supply_pack/medical/frontier_first_aid | ||
| name = "Frontier First Aid Crate" | ||
| crate_name = "frontier first aid crate" | ||
| desc = "Contains two of each of frontier medical kits, and combat surgeon medical kits." | ||
| access = ACCESS_MEDICAL | ||
| cost = CARGO_CRATE_VALUE * 10 | ||
| contains = list( | ||
| /obj/item/storage/medkit/frontier/stocked = 2, | ||
| /obj/item/storage/medkit/combat_surgeon/stocked = 2, | ||
| ) | ||
|
|
||
| /datum/supply_pack/medical/heavy_duty_medical | ||
| name = "Heavy Duty Medical Kit Crate" | ||
| crate_name = "heavy duty medical kit crate" | ||
| desc = "Contains a large satchel medical kit, and a first responder surgical kit." | ||
| access = ACCESS_MEDICAL | ||
| cost = CARGO_CRATE_VALUE * 10 | ||
| contains = list( | ||
| /obj/item/storage/backpack/duffelbag/deforest_medkit/stocked, | ||
| /obj/item/storage/backpack/duffelbag/deforest_surgical/stocked, | ||
| ) |
Oops, something went wrong.