Skip to content

Commit

Permalink
Merge branch 'master' into paperwork
Browse files Browse the repository at this point in the history
  • Loading branch information
MrCastmer authored Aug 20, 2024
2 parents 8c949bb + b3cf7e8 commit 6b8fcef
Show file tree
Hide file tree
Showing 131 changed files with 2,157 additions and 388 deletions.
14 changes: 8 additions & 6 deletions code/game/data_huds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -235,12 +235,14 @@ Security HUDs! Basic mode shows only the job.
holder.icon_state = "hud_imp_chem"
set_hud_image_active(IMPCHEM_HUD)

if(HAS_TRAIT(src, TRAIT_MINDSHIELD))
holder = hud_list[IMPLOYAL_HUD]
var/icon/IC = icon(icon, icon_state, dir)
holder.pixel_y = IC.Height() - world.icon_size
holder.icon_state = "hud_imp_loyal"
set_hud_image_active(IMPLOYAL_HUD)
//Dripstation edited
if(istype(I, /obj/item/implant/mindshield))
var/obj/item/implant/mindshield/MS = I
holder = hud_list[IMPLOYAL_HUD]
var/icon/IC = icon(icon, icon_state, dir)
holder.pixel_y = IC.Height() - world.icon_size
holder.icon_state = MS.implant_visible_as
set_hud_image_active(IMPLOYAL_HUD)

/mob/living/carbon/human/proc/sec_hud_set_security_status()
var/image/holder = hud_list[WANTED_HUD]
Expand Down
2 changes: 2 additions & 0 deletions code/game/objects/items/implants/implant_mindshield.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
return dat


/* Dripstation start
/obj/item/implant/mindshield/implant(mob/living/target, mob/user, silent = FALSE, force = FALSE)
if(..())
if(!target.mind)
Expand Down Expand Up @@ -85,6 +86,7 @@
ADD_TRAIT(target, TRAIT_MINDSHIELD, "implant")
target.sec_hud_set_implants()
return TRUE
*/ //Dripstation end

/obj/item/implant/mindshield/removed(mob/target, silent = FALSE, special = 0)
if(..())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,39 +85,19 @@
icon_state = "paramed"
req_access = list(ACCESS_PARAMEDIC)

/* dripstation edit
/obj/structure/closet/secure_closet/paramedic/PopulateContents()
..()
if(prob(50))
new /obj/item/storage/backpack/medic(src)
else
new /obj/item/storage/backpack/satchel/med(src)
new /obj/item/storage/firstaid/hypospray/paramedic(src)
new /obj/item/clothing/shoes/sneakers/white(src)
switch(pick("blue", "green", "purple"))
if ("blue")
new /obj/item/clothing/under/rank/medical/doctor/blue(src)
if ("green")
new /obj/item/clothing/under/rank/medical/doctor/green(src)
if ("purple")
new /obj/item/clothing/under/rank/medical/doctor/purple(src)
switch(pick("blue", "green", "purple"))
if ("blue")
new /obj/item/clothing/under/rank/medical/doctor/blue(src)
if ("green")
new /obj/item/clothing/under/rank/medical/doctor/green(src)
if ("purple")
new /obj/item/clothing/under/rank/medical/doctor/purple(src)
new /obj/item/clothing/under/rank/medical(src)
new /obj/item/clothing/suit/toggle/labcoat/emt(src)
new /obj/item/clothing/head/beret/emt/green(src)
new /obj/item/clothing/head/beret/emt(src)
new /obj/item/clothing/head/soft/emt(src)
new /obj/item/clothing/shoes/sneakers/white(src) //shoes and a jumpsuit in case something goes wrong, otherwise clothes are just in vendor
new /obj/item/clothing/under/rank/medical/doctor(src)
new /obj/item/defibrillator/loaded(src)
new /obj/item/clothing/suit/toggle/labcoat/emt/green(src)
new /obj/item/clothing/head/soft/emt/green (src)
new /obj/item/storage/firstaid/hypospray/paramedic(src)
new /obj/item/radio/headset/headset_med(src)
new /obj/item/storage/belt/medical(src)
new /obj/item/clothing/gloves/color/latex/nitrile(src)
new /obj/item/clothing/glasses/hud/health(src)
new /obj/item/roller(src)
*/

/obj/structure/closet/secure_closet/mmedical
name = "mining medic's locker"
Expand Down Expand Up @@ -199,6 +179,7 @@
req_access = list(ACCESS_PSYCH)
icon_state = "cabinet"

/* dripstation edit
/obj/structure/closet/secure_closet/psych/PopulateContents()
..()
new /obj/item/clothing/suit/straight_jacket(src)
Expand All @@ -210,3 +191,4 @@
new /obj/item/storage/pill_bottle/psicodine(src)
new /obj/item/assembly/flash(src)
new /obj/item/assembly/flash(src)
*/
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@
max_integrity = 70
door_anim_time = 0 // no animation

/* //dripstation edit
/obj/structure/closet/secure_closet/detective/PopulateContents()
..()
new /obj/item/storage/box/evidence(src)
Expand All @@ -188,6 +189,7 @@
new /obj/item/binoculars(src)
new /obj/item/storage/backpack/duffelbag/clothing/sec/detective(src)
new /obj/item/barrier_taperoll/police(src)
*/

/obj/structure/closet/secure_closet/injection
name = "lethal injections"
Expand Down Expand Up @@ -319,6 +321,7 @@
max_integrity = 70
door_anim_time = 0

/* //dripstation edit
/obj/structure/closet/secure_closet/physician/PopulateContents()
..()
new /obj/item/storage/backpack/duffelbag/clothing/sec/physician(src)
Expand All @@ -331,3 +334,4 @@
new /obj/item/clothing/mask/breath/medical(src)
new /obj/item/defibrillator/loaded(src)
new /obj/item/clothing/gloves/color/latex/nitrile
*/
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
/obj/structure/closet/syndicate/personal
desc = "It's a personal storage unit for operative gear."

/* Dripstation edit, check modular_dripstation\code\game\objects\structures\crates_lockers\closets.dm
/obj/structure/closet/syndicate/personal/PopulateContents()
..()
new /obj/item/clothing/under/syndicate(src)
Expand All @@ -15,6 +16,7 @@
new /obj/item/storage/belt/military(src)
new /obj/item/crowbar/red(src)
new /obj/item/clothing/glasses/night(src)
*/

/obj/structure/closet/syndicate/nuclear
desc = "It's a storage unit for a Syndicate boarding party."
Expand Down
4 changes: 4 additions & 0 deletions code/game/turfs/turf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,11 @@ GLOBAL_LIST_EMPTY(station_turfs)
/turf/handle_fall(mob/faller)
if(has_gravity(src))
playsound(src, "bodyfall", 50, 1)
/* dripstation edit
faller.drop_all_held_items()
*/
if(!HAS_TRAIT(faller, TRAIT_STRONG_GRIP)) //dripstation edit
faller.drop_all_held_items() //dripstation edit

/turf/proc/photograph(limit=20)
var/image/I = new()
Expand Down
3 changes: 3 additions & 0 deletions code/modules/antagonists/devil/devil_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
/obj/item/clothing/under/rank/medical/virologist = 1,
/obj/item/clothing/under/rank/medical/nursesuit = 1,
/obj/item/clothing/under/rank/medical = 1,
/* Dripstation edit
/obj/item/clothing/under/rank/det = 1,
*/
/obj/item/clothing/under/rank/security/detective = 1,
/obj/item/clothing/under/suit/white = 0.5,
/obj/item/clothing/under/rank/civilian/chaplain/burial = 1
)
Expand Down
32 changes: 32 additions & 0 deletions code/modules/cargo/packs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@
/obj/item/toy/crayon/white,
/obj/item/clothing/head/fedora/det_hat)
crate_name = "forensics crate"

/*
/datum/supply_pack/security/laser
name = "Lasers Crate"
Expand All @@ -327,6 +328,7 @@
/obj/item/gun/energy/laser)
crate_name = "laser crate"
*/

/datum/supply_pack/security/secfiringpins
name = "Mindshield Firing Pins Crate"
desc = "Upgrade your arsenal with 10 mindshield firing pins. Requires Security access to open."
Expand Down Expand Up @@ -1733,6 +1735,36 @@
/obj/item/vending_refill/wallhypo)
crate_name = "medical vending crate"

//DRIPSTATION
/datum/supply_pack/medical/gloves
name = "Nitrile Gloves Crate"
desc = "Contains one pair of pricy nitrile gloves."
cost = 1000
small_item = TRUE
contains = list(/obj/item/clothing/gloves/color/latex/nitrile)

/datum/supply_pack/costumes_toys/randomised/sunglasses
name = "Eye Protection Crate"
desc = "Contains one pair of pricy real eye protection."
contraband = TRUE
cost = 700
num_contained = 1
small_item = TRUE
contains = list(/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses/aviators)

/datum/supply_pack/security/armory/sunglasses
name = "Sunglasses Crate"
desc = "Contains three pairs of pricy real sunglasses."
cost = 1500
contains = list(/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses)
crate_name = "sunglasses crate"
//DRIPSTATION

//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Science /////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 2 additions & 0 deletions code/modules/clothing/neck/_neck.dm
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@
icon_state = "stripedbluescarf"
custom_price = 10

/* Dripstation edit
/obj/item/clothing/neck/petcollar
name = "pet collar"
desc = "It has a little bell!"
Expand All @@ -191,6 +192,7 @@
/obj/item/clothing/neck/petcollar/attack_self(mob/user)
tagname = stripped_input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot", MAX_NAME_LEN)
name = "[initial(name)] - [tagname]"
Dripstation edit */

/obj/item/clothing/neck/artist
name = "post-modern scarf"
Expand Down
3 changes: 3 additions & 0 deletions code/modules/clothing/outfits/standard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
/datum/outfit/tournament/gangster
name = "tournament gangster"

/* Dripstation Edit
uniform = /obj/item/clothing/under/rank/det
*/
uniform = /obj/item/clothing/under/rank/security/detective // Dripstation Edit
suit = /obj/item/clothing/suit/det_suit
glasses = /obj/item/clothing/glasses/thermal/monocle
head = /obj/item/clothing/head/fedora/det_hat
Expand Down
2 changes: 2 additions & 0 deletions code/modules/jobs/job_types/detective.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@
pda_type = /obj/item/modular_computer/tablet/pda/preset/security/detective

ears = /obj/item/radio/headset/headset_sec/alt
/* Dripstation edit
uniform = /obj/item/clothing/under/rank/det
*/
uniform_skirt = /obj/item/clothing/under/rank/security/detective/skirt
neck = /obj/item/clothing/neck/tie/detective
shoes = /obj/item/clothing/shoes/sneakers/brown
Expand Down
4 changes: 4 additions & 0 deletions code/modules/mob/living/simple_animal/friendly/pet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,12 @@
/mob/living/simple_animal/pet/regenerate_icons()
cut_overlays()
if(pcollar && collar_type)
/* Dripstation edit
add_overlay("[collar_type]collar")
add_overlay("[collar_type]tag")
*/
add_overlay(mutable_appearance('modular_dripstation/icons/mob/pet.dmi', "[collar_type]collar[pcollar.collar]"))
add_overlay(mutable_appearance('modular_dripstation/icons/mob/pet.dmi', "[collar_type]tag[pcollar.tagtype]"))

/mob/living/simple_animal/pet/proc/wuv(mob/M, change = TRUE)
if(change)
Expand Down
24 changes: 24 additions & 0 deletions modular_dripstation/code/game/gamemodes/nuclear/nuclear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,35 @@
justanop.teach(H)

/datum/outfit/syndicate/full
suit = /obj/item/clothing/suit/space/hardsuit/syndi/bloodred
belt = /obj/item/storage/belt/military/webbing/syndicate/gorlex
back = /obj/item/storage/backpack/syndie
backpack_contents = list(/obj/item/storage/box/syndie/nuke=1,\
/obj/item/tank/jetpack/oxygen/harness=1,\
/obj/item/gun/ballistic/automatic/pistol=1,\
/obj/item/kitchen/knife/combat/survival)

/datum/antagonist/nukeop/lone/equip_op()
if(!ishuman(owner.current))
return
var/mob/living/carbon/human/H = owner.current

H.set_species(/datum/species/human) //Plasamen burn up otherwise, and lizards are vulnerable to asimov AIs

H.equipOutfit(nukeop_outfit)
var/obj/item/clothing/head/helmet/space/hardsuit/syndi/HE = H.get_item_by_slot(ITEM_SLOT_HEAD)
if(istype(HE, /obj/item/clothing/head/helmet/space/hardsuit/syndi))
HE.spaceready(H)
return TRUE

/datum/outfit/nuclear_operative
suit = /obj/item/clothing/suit/space/hardsuit/syndi/bloodred/preview
head = /obj/item/clothing/head/helmet/space/hardsuit/syndi/bloodred/preview

/datum/outfit/nuclear_operative_elite
suit = /obj/item/clothing/suit/space/hardsuit/syndi/elite/preview
head = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/preview

/datum/outfit/syndicate/no_crystals
var/faction = "The Syndicate"

Expand Down
25 changes: 0 additions & 25 deletions modular_dripstation/code/game/gamemods/nuclear/nuclear.dm

This file was deleted.

29 changes: 29 additions & 0 deletions modular_dripstation/code/game/machinery/suit_storage_unit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,13 @@
magboots_type = /obj/item/clothing/shoes/magboots/security
department = "sec"

/obj/machinery/suit_storage_unit/warden
suit_type = /obj/item/clothing/suit/space/hardsuit/security/warden
mask_type = /obj/item/clothing/mask/gas/sechailer
tank_type = /obj/item/tank/internals/oxygen/red
magboots_type = /obj/item/clothing/shoes/magboots/security
department = "sec"

/obj/machinery/suit_storage_unit/hos
suit_type = /obj/item/clothing/suit/space/hardsuit/security/hos
mask_type = /obj/item/clothing/mask/gas/sechailer
Expand All @@ -87,6 +94,16 @@
mask_type = /obj/item/clothing/mask/gas/explorer
department = "cargo"

/obj/machinery/suit_storage_unit/mining/winter
suit_type = /obj/item/clothing/suit/hooded/explorer/winter
mask_type = /obj/item/clothing/mask/gas/explorer
department = "cargo"

/obj/machinery/suit_storage_unit/mining/medic
suit_type = /obj/item/clothing/suit/hooded/miningmedic
mask_type = /obj/item/clothing/mask/gas/explorer
department = "med"

/obj/machinery/suit_storage_unit/miningdualmod
suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/mining
mask_type = /obj/item/clothing/mask/gas/explorer
Expand Down Expand Up @@ -168,6 +185,18 @@
tank_type = /obj/item/tank/jetpack/oxygen/harness
department = "synd"

/obj/machinery/suit_storage_unit/syndicate/engi
suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/engineering/syndicate
mask_type = /obj/item/clothing/mask/gas/syndicate
tank_type = /obj/item/tank/jetpack/oxygen/harness
department = "synd"

/obj/machinery/suit_storage_unit/syndicate/winter/engi
suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/engineering/syndicate/winter
mask_type = /obj/item/clothing/mask/gas/syndicate
tank_type = /obj/item/tank/jetpack/oxygen/harness
department = "synd"

/obj/machinery/suit_storage_unit/syndicate/donk
suit_type = /obj/item/clothing/suit/space/hardsuit/syndi
mask_type = /obj/item/clothing/mask/gas/syndicate
Expand Down
3 changes: 3 additions & 0 deletions modular_dripstation/code/game/objects/items/card_ids.dm
Original file line number Diff line number Diff line change
Expand Up @@ -174,3 +174,6 @@

/obj/item/card/id/ert/clown
icon_state = "ERT_clown"

/obj/item/card/id/makeshift
icon = 'modular_dripstation/icons/obj/card.dmi'
Loading

0 comments on commit 6b8fcef

Please sign in to comment.