cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-17 02:54:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

REOPEN: REVERT: Changes faster fireman carrying from a trait on gloves to a skillchip (#58268)

Browse Source 
Co-authored-by: SuperNovaa41 <supernovaa41@protonmail.com>
This commit is contained in:
tralezab
2021-04-15 00:15:45 -07:00
committed by GitHub
parent b9f849798c
commit 7d58d8de6c
9 changed files with 10 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/misc.dm
-1
View File
@@ -551,4 +551,3 @@ GLOBAL_LIST_INIT(pda_styles, sortList(list(MONO, VT, ORBITRON, SHARE)))
//while using the SKILLCHIP_RESTRICTED_CATEGORIES flag
#define SKILLCHIP_CATEGORY_GENERAL "general"
#define SKILLCHIP_CATEGORY_JOB "job"
#define SKILLCHIP_CATEGORY_FIREMAN_CARRYING "fireman carrying"
code/game/objects/items/storage/boxes.dm
-23
View File
@@ -1288,29 +1288,6 @@
new/obj/item/skillchip/job/engineer(src)
new/obj/item/skillchip/job/engineer(src)
/obj/item/storage/box/skillchips/quick
name = "box of Ant Hauler skill chips"
desc = "Contains Ant Hauler skill chips."
/obj/item/storage/box/skillchips/quick/PopulateContents()
new/obj/item/skillchip/quickcarry(src)
new/obj/item/skillchip/quickcarry(src)
new/obj/item/skillchip/quickcarry(src)
new/obj/item/skillchip/quickcarry(src)
new/obj/item/skillchip/quickcarry(src)
new/obj/item/skillchip/quickcarry(src)
new/obj/item/skillchip/quickcarry(src)
/obj/item/storage/box/skillchips/quicker
name = "box of RES-Q skill chips"
desc = "Contains RES-Q skill chips."
/obj/item/storage/box/skillchips/quicker/PopulateContents()
new/obj/item/skillchip/quickercarry(src)
new/obj/item/skillchip/quickercarry(src)
new/obj/item/skillchip/quickercarry(src)
new/obj/item/skillchip/quickercarry(src)
/obj/item/storage/box/swab
name = "box of microbiological swabs"
desc = "Contains a number of sterile swabs for collecting microbiological samples."
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
-2
View File
@@ -42,7 +42,6 @@
new /obj/item/clothing/gloves/color/latex/nitrile(src)
new /obj/item/storage/belt/medical(src)
new /obj/item/clothing/glasses/hud/health(src)
new /obj/item/storage/box/skillchips/quick(src)
return
/obj/structure/closet/secure_closet/psychology
@@ -96,7 +95,6 @@
new /obj/item/wallframe/defib_mount(src)
new /obj/item/circuitboard/machine/techfab/department/medical(src)
new /obj/item/storage/photo_album/cmo(src)
new /obj/item/storage/box/skillchips/quicker(src)
new /obj/item/clothing/suit/hooded/wintercoat/medical/cmo(src)
/obj/structure/closet/secure_closet/animal
code/modules/clothing/gloves/color.dm
+4 -2
View File
@@ -182,19 +182,21 @@
/obj/item/clothing/gloves/color/latex
name = "latex gloves"
desc = "Cheap sterile gloves made from latex. Transfers minor paramedic knowledge to the user via budget nanochips."
desc = "Cheap sterile gloves made from latex. Provides quicker carrying from a good grip."
icon_state = "latex"
inhand_icon_state = "latex"
siemens_coefficient = 0.3
permeability_coefficient = 0.01
clothing_traits = list(TRAIT_QUICK_CARRY)
transfer_prints = TRUE
resistance_flags = NONE
/obj/item/clothing/gloves/color/latex/nitrile
name = "nitrile gloves"
desc = "Pricy sterile gloves that are thicker than latex. Transfers intimate paramedic knowledge into the user via nanochips."
desc = "Pricy sterile gloves that are thicker than latex. Excellent grip ensures very fast carrying of patients."
icon_state = "nitrile"
inhand_icon_state = "nitrilegloves"
clothing_traits = list(TRAIT_QUICKER_CARRY)
transfer_prints = FALSE
/obj/item/clothing/gloves/color/latex/nitrile/infiltrator
code/modules/jobs/job_types/chief_medical_officer.dm
+1 -1
View File
@@ -48,7 +48,7 @@
suit_store = /obj/item/flashlight/pen/paramedic
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced/command=1)
skillchips = list(/obj/item/skillchip/entrails_reader, /obj/item/skillchip/quickercarry)
skillchips = list(/obj/item/skillchip/entrails_reader)
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel/med
code/modules/jobs/job_types/medical_doctor.dm
+1 -1
View File
@@ -38,7 +38,7 @@
duffelbag = /obj/item/storage/backpack/duffelbag/med
box = /obj/item/storage/box/survival/medical
skillchips = list(/obj/item/skillchip/entrails_reader, /obj/item/skillchip/quickcarry)
skillchips = list(/obj/item/skillchip/entrails_reader)
chameleon_extras = /obj/item/gun/syringe
code/modules/jobs/job_types/paramedic.dm
-2
View File
@@ -38,8 +38,6 @@
backpack_contents = list(/obj/item/roller=1)
pda_slot = ITEM_SLOT_LPOCKET
skillchips = list(/obj/item/skillchip/quickercarry)
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel/med
duffelbag = /obj/item/storage/backpack/duffelbag/med
code/modules/library/skill_learning/skillchip.dm
-24
View File
@@ -433,27 +433,3 @@
skill_icon = "lungs"
activate_message = "<span class='notice'>You feel that you know a lot about interpreting organs.</span>"
deactivate_message = "<span class='notice'>Knowledge of liver damage, heart strain and lung scars fades from your mind.</span>"
/obj/item/skillchip/quickcarry
name = "Ant Hauler skillchip"
auto_traits = list(TRAIT_QUICK_CARRY)
skill_name = "Ant Hauler"
chip_category = SKILLCHIP_CATEGORY_FIREMAN_CARRYING
skillchip_flags = SKILLCHIP_RESTRICTED_CATEGORIES
incompatibility_list = list(SKILLCHIP_CATEGORY_FIREMAN_CARRYING)
skill_description = "Discover various lifting techniques to more accurately and quickly lift someone up into a fireman carry."
skill_icon = "hand-holding"
activate_message = "<span class='notice'>You feel like you can easily lift and carry people around.</span>"
deactivate_message = "<span class='notice'>Your skill at lifting people into a fireman carry fades from your mind.</span>"
/obj/item/skillchip/quickercarry
name = "RES-Q skillchip"
auto_traits = list(TRAIT_QUICKER_CARRY)
skill_name = "RES-Q"
chip_category = SKILLCHIP_CATEGORY_FIREMAN_CARRYING
skillchip_flags = SKILLCHIP_RESTRICTED_CATEGORIES
incompatibility_list = list(SKILLCHIP_CATEGORY_FIREMAN_CARRYING)
skill_description = "Learn how to fireman carry like a professional, and haul the injured, sick or dying with speed!"
skill_icon = "hand-holding"
activate_message = "<span class='notice'>Carrying people across your back feels like second nature to you.</span>"
deactivate_message = "<span class='notice'>Your expert knowledge in fireman carrying fades from your mind.</span>"
code/modules/mob/living/carbon/human/human.dm
+4 -6
View File
@@ -919,19 +919,17 @@
to_chat(src, "<span class='warning'>You can't fireman carry [target] while [target.p_they()] [target.p_are()] standing!</span>")
return
var/carrydelay = 5 SECONDS //This is augmented by traits from your skillchip
var/carrydelay = 5 SECONDS //if you have latex you are faster at grabbing
var/skills_space = "" //cobby told me to do this
if(HAS_TRAIT(src, TRAIT_QUICKER_CARRY))
carrydelay = 3 SECONDS
skills_space = " expertly"
skills_space = " very quickly"
else if(HAS_TRAIT(src, TRAIT_QUICK_CARRY))
carrydelay = 4 SECONDS
skills_space = " quickly"
visible_message("<span class='notice'>[src] starts[skills_space] lifting [target] onto [p_their()] back..</span>",
//Joe Medic starts quickly/expertly lifting Grey Tider onto their back..
"<span class='notice'>[carrydelay < 3.5 SECONDS ? "Using your fireman carrying training, you" : "You"][skills_space] start to lift [target] onto your back[carrydelay == 4 SECONDS ? ", with ease thanks to your advanced knowledge.." : "..."]</span>")
//(Using your fireman carrying training, you/You) ( /quickly/expertly) start to lift Grey Tider onto your back(, with ease thanks to your advanced knowledge../...)
visible_message("<span class='notice'>[src] starts[skills_space] lifting [target] onto [p_their()] back...</span>",
"<span class='notice'>You[skills_space] start to lift [target] onto your back...</span>")
if(!do_after(src, carrydelay, target))
visible_message("<span class='warning'>[src] fails to fireman carry [target]!</span>")
return