Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hypospray Mk1 Rework #730

Merged
merged 30 commits into from
Jan 25, 2025
Merged

Hypospray Mk1 Rework #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
09054b5
Initial upload (will have errors)
crossexonar Dec 15, 2024
680527e
left some files unticked improperly, whoopsies.
crossexonar Dec 15, 2024
97e0889
Merge branch 'TS-Rogue-Star:master' into Hypospray-Revision
crossexonar Jan 7, 2025
cce0eef
TGUI and stuff
crossexonar Jan 7, 2025
499c809
Merge branch 'Hypospray-Revision' of https://github.com/crossexonar/R…
crossexonar Jan 7, 2025
78adfdd
More compatability work
crossexonar Jan 8, 2025
82033b4
Wow lotta small commits, weh.
crossexonar Jan 8, 2025
6ceeced
Replaced as many of the Mk1 Hypo instances as I could find, wew.
crossexonar Jan 8, 2025
16799e4
Oopsied the protolathe
crossexonar Jan 8, 2025
57ee0af
Put the wrong pathing on clothing acceptance, messed up the pathing o…
crossexonar Jan 8, 2025
8a1dbcb
Project took so long to get approved accidently over-wrote liquid bel…
crossexonar Jan 8, 2025
c1b2cea
Improper labeling of a comment text, small but eh.
crossexonar Jan 8, 2025
7632f9a
Accidently removed support for old hyposprays (and autoinjectors) fro…
crossexonar Jan 8, 2025
ae91304
renamed hypospray-revision to hypospray_rs
crossexonar Jan 8, 2025
783b040
Renamed hypospray-revision to hypospray_rs
crossexonar Jan 8, 2025
9ba2612
im going to strangle VScode.
crossexonar Jan 8, 2025
f5bf6ac
Renamed Mk1 hypo to iHypo, accidently included some code that put thi…
crossexonar Jan 8, 2025
7c2b566
Added in additional wait time if target is wearing a voidsuit as requ…
crossexonar Jan 8, 2025
879f0a7
add to maps
Michab02 Jan 11, 2025
98679c6
Merge pull request #1 from Michab02/Hypospray-Revision
crossexonar Jan 11, 2025
bf5caff
Merge branch 'TS-Rogue-Star:master' into Hypospray-Revision
crossexonar Jan 11, 2025
6bde4f7
Attributions, mapping changes, removing hypos from nanomed, removing …
crossexonar Jan 12, 2025
19745ce
attributions and final balance tweaks, map change and removed hypos f…
crossexonar Jan 12, 2025
721eae6
Merge branch 'master' into Hypospray-Revision
crossexonar Jan 12, 2025
0ee6767
Namechange to a suggestion by alkali and Keane. Forgot to put the act…
crossexonar Jan 18, 2025
208566b
Merge branch 'Hypospray-Revision' of https://github.com/crossexonar/R…
crossexonar Jan 18, 2025
43b0ff2
QoL update: Adds examine text for transfer rate clarification. Adds t…
crossexonar Jan 18, 2025
34a405e
Merge branch 'master' into Hypospray-Revision
crossexonar Jan 25, 2025
5f63f32
Removed DEAD code
crossexonar Jan 25, 2025
94a7a7b
Merge branch 'Hypospray-Revision' of https://github.com/crossexonar/R…
crossexonar Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ATTRIBUTIONS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,17 @@
**Link:** https://github.com/VOREStation/VOREStation/pull/10476 - https://github.com/TS-Rogue-Star/Rogue-Star/pull/702<br>
**License:** Licensed for use by VOREStation, Rogue Star, and their downstreams; unlicensed for further use without permission of copyright holder<br>
<br>
**File:** `icons/obj/syringe.dmi`<br>
**Icon-States:**nchypo, nchypo_empty, nyhpo, nhypo_empty, ncadvhypo, ncadvhypo_empty, nadvhypo, nadvhypo_empty<br>
**Creator:** Legacy sprites recolored by Andy/Kligor<br>
**Link:** https://github.com/TS-Rogue-Star/Rogue-Star/pull/730<br>
**License:** [CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)<br>
<br>
**File:** `icons/obj/storage.dmi`<br>
**Icon-States:**vialcase, vialcaselight, vialcasedark<br>
**Creator:** Andy/Kligor<br>
**Link:** https://github.com/TS-Rogue-Star/Rogue-Star/pull/730<br>
**License:** [CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)<br>
**File**: `sound/screams` - `f1.ogg - f15.ogg`<br>
**Creator:** Volonda<br>
**Link:** https://freesound.org/people/Volonda/sounds/439517/<br>
Expand Down
1 change: 1 addition & 0 deletions code/__defines/chemistry.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,5 @@ var/list/cheartstopper = list("potassium_chloride") // Thi
#define MAX_UNITS_PER_PILL 60 // Max amount of units in a pill
#define MAX_UNITS_PER_PATCH 60 // Max amount of units in a patch
#define MAX_UNITS_PER_BOTTLE 60 // Max amount of units in a bottle (it's volume)
#define MAX_UNITS_PER_VIAL 30 // Max amount of units in a vial (it's volume)
#define MAX_CUSTOM_NAME_LEN 64 // Max length of a custom pill/condiment/whatever
3 changes: 2 additions & 1 deletion code/datums/supplypacks/contraband.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
list( //the doc,
/obj/item/weapon/storage/firstaid/combat,
/obj/item/weapon/gun/projectile/dartgun,
/obj/item/weapon/reagent_containers/hypospray,
/obj/item/weapon/revised_hypospray/CMO,//RS Edit
///obj/item/weapon/reagent_containers/hypospray,
/obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate,
/obj/item/weapon/reagent_containers/glass/bottle/cyanide,
/obj/item/ammo_magazine/chemdart
Expand Down
3 changes: 1 addition & 2 deletions code/game/gamemodes/objective.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ var/global/list/all_objectives = list()
"a chief medical officer's jumpsuit" = /obj/item/clothing/under/rank/chief_medical_officer,
"a head of security's jumpsuit" = /obj/item/clothing/under/rank/head_of_security,
"a head of personnel's jumpsuit" = /obj/item/clothing/under/rank/head_of_personnel,
"the hypospray" = /obj/item/weapon/reagent_containers/hypospray/vial,
"the hypospray" = /obj/item/weapon/revised_hypospray/CMO,//RS Edit /obj/item/weapon/reagent_containers/hypospray/vial,
"the site manager's pinpointer" = /obj/item/weapon/pinpointer,
"an ablative armor vest" = /obj/item/clothing/suit/armor/laserproof,
)
Expand Down Expand Up @@ -903,4 +903,3 @@ var/global/list/all_objectives = list()
rval = 2
return 0
return rval

3 changes: 2 additions & 1 deletion code/game/jobs/job/job_goodies.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,8 @@
/datum/job/cmo
mail_goodies = list(
/obj/item/device/healthanalyzer/advanced = 250,
/obj/item/weapon/reagent_containers/hypospray = 250,
//RS Edit /obj/item/weapon/reagent_containers/hypospray = 250,
/obj/item/weapon/revised_hypospray/CMO = 250,
/obj/item/weapon/storage/firstaid/adv = 200,
/obj/item/weapon/reagent_containers/blood/OMinus = 150,
/obj/item/weapon/pen/fountain6 = 50,
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/weapons/storage/belt.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@
/obj/item/clothing/head/surgery,
/obj/item/clothing/gloves,
/obj/item/weapon/reagent_containers/hypospray,
/obj/item/weapon/revised_hypospray, //RS Add
/obj/item/weapon/hypospray_mkii,
/obj/item/weapon/reagent_containers/glass/bottle/hypovial,
/obj/item/clothing/glasses,
Expand Down
36 changes: 36 additions & 0 deletions code/game/objects/items/weapons/storage/firstaid.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,42 @@
starts_with = list(/obj/item/weapon/hypospray_mkii/CMO/combat, /obj/item/weapon/reagent_containers/glass/bottle/hypovial/large/preloaded/combat = 4)
item_state_slots = list(slot_r_hand_str = "firstaid-surgery", slot_l_hand_str = "firstaid-surgery")



/*
* revised hypo kits (RS Add)
*/

//RS Add MkI Hypo Rework
/obj/item/weapon/storage/firstaid/mkIhypokit
name = "B.O.R.K. Medispray Kit"
desc = "Contains a B.O.R.K. Medispray and its vials. It can only hold B.O.R.K. Medispray related items."
icon = 'icons/obj/storage.dmi'
icon_state = "vialcaselight"
slot_flags = SLOT_BELT
max_storage_space = ITEMSIZE_COST_SMALL * 7
starts_with = list(/obj/item/weapon/revised_hypospray,
/obj/item/weapon/paper/medispray_manual,
/obj/item/weapon/reagent_containers/glass/beaker/vial = 5)
can_hold = list(/obj/item/weapon/revised_hypospray, /obj/item/weapon/reagent_containers/glass/beaker/vial,/obj/item/weapon/paper)
//can fit vials, and the mk.I hyospray.

Copy link
Contributor

@Cameron-The-Raven Cameron-The-Raven Jan 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

/obj/item/weapon/storage/firstaid/mkIhypokit/handle_item_insertion()
  beaker_total = 0
  for(var/obj/item/weapon/reagent_containers/container in contents)
    if(istype(container)
      beaker_total += 1
    else
      continue
  update_icon()


/obj/item/weapon/storage/firstaid/mkIhypokit/update_icon()
  ..()
  icon_state = "vialcaselight-[beaker_total]"

/obj/item/weapon/storage/firstaid/mkIhypokit/cmo
name = "Deluxe B.O.R.K. Medispray Kit"
desc = "Contains a Deluxe B.O.R.K. Medispray and its vials and its hypovials, can hold bottles."
icon_state = "vialcaselight"
max_storage_space = ITEMSIZE_COST_SMALL * 10
starts_with = list(/obj/item/weapon/revised_hypospray/CMO,
/obj/item/weapon/paper/medispray_manual,
/obj/item/weapon/reagent_containers/glass/bottle/preloaded/tramadol,
/obj/item/weapon/reagent_containers/glass/bottle/preloaded/bicaridine,
/obj/item/weapon/reagent_containers/glass/bottle/preloaded/antitoxin,
/obj/item/weapon/reagent_containers/glass/bottle/preloaded/keloderma,
/obj/item/weapon/reagent_containers/glass/bottle/preloaded/dexalin
)
can_hold = list(/obj/item/weapon/revised_hypospray, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/glass/beaker/vial,/obj/item/weapon/paper)
item_state_slots = list(slot_r_hand_str = "firstaid-surgery", slot_l_hand_str = "firstaid-surgery")
//can fit vials, bottles, and any of the revised hypos.
/*
* Pill Bottles
*/
Expand Down
11 changes: 6 additions & 5 deletions code/game/objects/items/weapons/storage/pouches.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@
/obj/item/weapon/extinguisher/mini,
/obj/item/weapon/tape_roll,
/obj/item/device/integrated_electronics/wirer,
/obj/item/device/integrated_electronics/debugger,
/obj/item/weapon/shovel/spade,
/obj/item/stack/nanopaste,
/obj/item/device/integrated_electronics/debugger,
/obj/item/weapon/shovel/spade,
/obj/item/stack/nanopaste,
/obj/item/device/geiger
) //Vorestation Add - make it the same as the tool-belt why was it not like this to start with wtf

Expand Down Expand Up @@ -146,6 +146,7 @@
/obj/item/weapon/storage/pill_bottle,
/obj/item/stack/medical,
/obj/item/weapon/reagent_containers/hypospray,
/obj/item/weapon/revised_hypospray, //RS add
/obj/item/weapon/storage/quickdraw/syringe_case,
/obj/item/weapon/syringe_cartridge,
/obj/item/clothing/gloves/sterile,
Expand All @@ -156,7 +157,7 @@
/obj/item/stack/nanopaste,
/obj/item/taperoll/medical,
/obj/item/weapon/storage/box/freezer,
/obj/item/clothing/mask/chewable/candy/lolli,
/obj/item/clothing/mask/chewable/candy/lolli,
) //Vorestation add - added a bunch of misc medical stuff
max_storage_space = ITEMSIZE_COST_SMALL*3 //Vorestation Add - makes it slightly smaller since its a lot of stuff with pocket access
remove_delay = 5 //Vorestation Add - .5 second delay, get the medical things faster because there is no reason to use this otherwise. still gotta stop moving to take things out.
Expand Down Expand Up @@ -218,4 +219,4 @@
icon_state = "holdingpouch"
max_storage_space = INVENTORY_POUCH_SPACE*2 //VOREStation Edit: Consistency with normal bags of holding

#undef INVENTORY_POUCH_SPACE
#undef INVENTORY_POUCH_SPACE
2 changes: 1 addition & 1 deletion code/game/objects/random/misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
prob(5);/obj/item/weapon/reagent_containers/syringe/antitoxin,
prob(3);/obj/item/weapon/reagent_containers/syringe/antiviral,
prob(5);/obj/item/weapon/reagent_containers/syringe/inaprovaline,
prob(1);/obj/item/weapon/reagent_containers/hypospray,
prob(1);/obj/item/weapon/revised_hypospray/CMO, //RS Edit/obj/item/weapon/reagent_containers/hypospray,
prob(1);/obj/item/weapon/storage/box/freezer,
prob(2);/obj/item/stack/nanopaste)

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/crates_lockers/closets/secure/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
/obj/item/device/radio/headset/heads/cmo,
/obj/item/device/radio/headset/heads/cmo/alt,
/obj/item/device/flash,
/obj/item/weapon/reagent_containers/hypospray/vial,
/obj/item/weapon/storage/firstaid/mkIhypokit/cmo, //RS Add
/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/cmo,
/obj/item/clothing/shoes/boots/winter/medical,
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/spacesuits/rig/suits/combat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
/obj/item/weapon/gun,
/obj/item/weapon/storage,
/obj/item/weapon/reagent_containers/hypospray,
/obj/item/weapon/revised_hypospray, //RS add
/obj/item/roller,
/obj/item/device/suit_cooling_unit
)
Expand Down
3 changes: 2 additions & 1 deletion code/modules/clothing/spacesuits/rig/suits/ert.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
/obj/item/weapon/melee/baton,
/obj/item/weapon/gun,
/obj/item/weapon/reagent_containers/hypospray,
/obj/item/weapon/revised_hypospray, //RS add
/obj/item/roller
)

Expand Down Expand Up @@ -100,4 +101,4 @@
/obj/item/rig_module/device/plasmacutter,
/obj/item/rig_module/device/rcd,
/obj/item/rig_module/datajack
)
)
3 changes: 2 additions & 1 deletion code/modules/clothing/spacesuits/rig/suits/pmc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
/obj/item/weapon/gun,
/obj/item/weapon/storage,
/obj/item/weapon/reagent_containers/hypospray,
/obj/item/weapon/revised_hypospray, //RS Add
/obj/item/roller
)

Expand Down Expand Up @@ -136,4 +137,4 @@
/obj/item/rig_module/ai_container,
/obj/item/rig_module/maneuvering_jets,
/obj/item/rig_module/mounted/egun,
)
)
1 change: 1 addition & 0 deletions code/modules/clothing/suits/labcoat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,
/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,
/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle,/obj/item/weapon/paper,
/obj/item/weapon/revised_hypospray, //RS add
/obj/item/weapon/hypospray_mkii, /obj/item/weapon/reagent_containers/glass/bottle/hypovial,
/obj/item/clothing/mask/gas)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
Expand Down
6 changes: 3 additions & 3 deletions code/modules/clothing/suits/utility_vr.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO
flags_inv = HIDEHOLSTER
allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle,/obj/item/weapon/paper)
allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,
/obj/item/weapon/revised_hypospray, //RS add
/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle,/obj/item/weapon/paper)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)

/obj/item/clothing/head/radiation
Expand All @@ -29,5 +31,3 @@
SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi',
SPECIES_WEREBEAST = 'icons/inventory/suit/mob_vr_werebeast.dmi'
)


6 changes: 0 additions & 6 deletions code/modules/economy/vending_machines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,12 +408,6 @@
/obj/item/weapon/reagent_containers/glass/bottle/toxin = 4,
/obj/item/weapon/reagent_containers/syringe/antiviral = 4,
/obj/item/weapon/reagent_containers/syringe = 12,
/obj/item/weapon/reagent_containers/glass/bottle/hypovial/small = 12,
/obj/item/weapon/hypospray_mkii = 4,
/obj/item/weapon/storage/firstaid/hypokit/brute = 2,
/obj/item/weapon/storage/firstaid/hypokit/burn = 2,
/obj/item/weapon/storage/firstaid/hypokit/toxin = 2,
/obj/item/weapon/storage/firstaid/hypokit/oxy = 2,
/obj/item/device/healthanalyzer = 5,
/obj/item/weapon/reagent_containers/glass/beaker = 4,
/obj/item/weapon/reagent_containers/dropper = 2,
Expand Down
42 changes: 42 additions & 0 deletions code/modules/reagents/machinery/chem_master.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
var/condi = 0
var/useramount = 15 // Last used amount
var/pillamount = 10
var/vialamount = 10
var/list/bottle_styles
var/bottlesprite = 1
var/pillsprite = 1
Expand Down Expand Up @@ -226,6 +227,22 @@
if(condi || !reagents.total_volume)
return
tgui_modal_input(src, id, "Please enter the amount of patches to make (max [MAX_MULTI_AMOUNT] at a time):", null, arguments, pillamount, 5)
if("create_vial") //RS Add
if(condi || !reagents.total_volume)
return
var/num = round(text2num(arguments["num"] || 1))
if(!num)
return
arguments["num"] = num
var/amount_per_vial = CLAMP(reagents.total_volume / num, 0, MAX_UNITS_PER_VIAL)
var/default_name = "[reagents.get_master_reagent_name()]"
var/vials_text = num == 1 ? "new vial" : "[num] new vials"
tgui_modal_input(src, id, "Please name your [vials_text] ([amount_per_vial]u in vial):", null, arguments, default_name, MAX_CUSTOM_NAME_LEN)
if("create_vials_multiple") //RS Add
if(condi || !reagents.total_volume)
return
tgui_modal_input(src, id, "Please enter the amount of vials to make (max [MAX_MULTI_AMOUNT] at a time):", null, arguments, vialamount / 5, 5)

if("create_bottle")
if(condi || !reagents.total_volume)
return
Expand Down Expand Up @@ -349,6 +366,31 @@
if(condi || !reagents.total_volume)
return
tgui_act("modal_open", list("id" = "create_patch", "arguments" = list("num" = answer)), ui, state)
if("create_vial") //RS Add
if(condi || !reagents.total_volume)
return
var/count = CLAMP(round(text2num(arguments["num"]) || 0), 0, MAX_MULTI_AMOUNT)
if(!count)
return

if(!length(answer))
answer = reagents.get_master_reagent_name()
var/amount_per_vial = CLAMP(reagents.total_volume / count, 0, MAX_UNITS_PER_VIAL)
while(count--)
if(reagents.total_volume <= 0)
to_chat(usr, "<span class='notice'>Not enough reagents to create these vials!</span>")
return
var/obj/item/weapon/reagent_containers/glass/beaker/vial/P = new(loc)
P.name = "[answer] vial"
P.pixel_x = rand(-7, 7) // random position
P.pixel_y = rand(-7, 7)
//P.icon_state = "vial-[bottlesprite]" || "bottle-1"
reagents.trans_to_obj(P, amount_per_vial)
P.update_icon()
if("create_vials_multiple") //RS Add
if(condi || !reagents.total_volume)
return
tgui_act("modal_open", list("id" = "create_vial", "arguments" = list("num" = answer)), ui, state)
if("create_bottle")
if(condi || !reagents.total_volume)
return
Expand Down
Loading
Loading