cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

hello (#47357)

Browse Source
This commit is contained in:
carlarctg
2019-10-30 01:47:25 -07:00
committed by Rob Bailey
parent caed3b9556
commit b49d3bb4ac
4 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/glass.dm
+1 -4
View File
@@ -332,10 +332,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
/obj/item/shard/Crossed(mob/living/L)
if(istype(L) && has_gravity(loc))
if(HAS_TRAIT(L, TRAIT_LIGHT_STEP))
playsound(loc, 'sound/effects/glass_step.ogg', 30, TRUE)
else
playsound(loc, 'sound/effects/glass_step.ogg', 50, TRUE)
playsound(loc, 'sound/effects/glass_step.ogg', HAS_TRAIT(L, TRAIT_LIGHT_STEP) ? 30 : 50, TRUE)
return ..()
/obj/item/shard/plasma
code/game/objects/items/tools/wrench.dm
+1 -1
View File
@@ -41,7 +41,7 @@
force = 2 //MEDICAL
throwforce = 4
attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked")
attack_verb = list("healed", "medicaled", "tapped", "poked", "analyzed") //"cobbyed"
/obj/item/wrench/medical/suicide_act(mob/living/user)
user.visible_message("<span class='suicide'>[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!</span>")
code/modules/power/lighting.dm
+1 -4
View File
@@ -831,10 +831,7 @@
/obj/item/light/Crossed(mob/living/L)
. = ..()
if(istype(L) && has_gravity(loc))
if(HAS_TRAIT(L, TRAIT_LIGHT_STEP))
playsound(loc, 'sound/effects/glass_step.ogg', 30, TRUE)
else
playsound(loc, 'sound/effects/glass_step.ogg', 50, TRUE)
playsound(loc, 'sound/effects/glass_step.ogg', HAS_TRAIT(L, TRAIT_LIGHT_STEP) ? 30 : 50, TRUE)
if(status == LIGHT_BURNED || status == LIGHT_OK)
shatter()
code/modules/vending/medical.dm
+1 -1
View File
@@ -9,6 +9,7 @@
/obj/item/reagent_containers/syringe = 12,
/obj/item/reagent_containers/dropper = 3,
/obj/item/healthanalyzer = 4,
/obj/item/wrench/medical = 1,
/obj/item/reagent_containers/pill/patch/libital = 5,
/obj/item/reagent_containers/pill/patch/aiuri = 5,
/obj/item/reagent_containers/syringe/convermol = 2,
@@ -34,7 +35,6 @@
/obj/item/storage/pill_bottle/psicodine = 2,
/obj/item/reagent_containers/hypospray/medipen = 3,
/obj/item/storage/belt/medical = 3,
/obj/item/wrench/medical = 1,
/obj/item/storage/firstaid/advanced = 2)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF