cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream/development' into development

Browse Source 
# Conflicts:
#	code/_helpers/time.dm
#	code/game/objects/items/devices/floor_painter.dm
#	code/game/objects/items/stacks/medical.dm
#	code/global.dm
#	code/modules/cargo/randomstock.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/paperwork/faxmachine.dm
This commit is contained in:
skull132
2016-12-18 01:06:45 +02:00
parent 30fbc7a67b 355504dabb
commit 9b094ad0eb
37 changed files with 543 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/magnetic_lock.dm
+10 -5
View File
@@ -13,7 +13,7 @@
//icon_state = "inactive"
w_class = 3
req_access = list(access_cent_specops)
health = 90
health = 150
var/department = "CENTCOM"
var/status = 0
@@ -107,13 +107,17 @@
user << "<span class='danger'>You cannot swipe your [I] through [src] with it partially dismantled!</span>"
return
if (istype(I, /obj/item/weapon) && user.a_intent == "hurt")
if (I.force >= 8)
if (istype(I, /obj/item/weapon) && user.a_intent == "harm")
if (I.force >= 18)
user.visible_message("<span class='danger'>[user] bashes [src] with [I]!</span>", "<span class='danger'>You strike [src] with [I], damaging it!</span>")
takedamage(I.force)
playsound(loc, "sound/weapons/genhit[rand(1,3)].ogg", I.force*3, 1)
spawn(3)
playsound(loc, "sound/effects/sparks[rand(1,4)].ogg", 30, 1)
return
else
user.visible_message("<span class='notice'>[user] hits [src] with [I] to no visible effect.</span>", "<span class='notice'>You hit [src] with [I], but it appears to have no effect.</span>")
user.visible_message("<span class='danger'>[user] hits [src] with [I] but fails to damage it.</span>", "<span class='warning'>You hit [src] with [I], [I.force >= 10 ? "and it almost makes a dent!" : "but it appears to have no visible effect."]</span>")
playsound(loc, "sound/weapons/Genhit.ogg", I.force*2.5, 1)
return
switch (constructionstate)
@@ -402,13 +406,14 @@
overlays += "overlay_deconstruct_[constructionstate]"
/obj/item/device/magnetic_lock/proc/takedamage(var/damage)
health -= damage
health -= rand(damage/2, damage)
if (damage >= 40 && prob(50))
health = 0
if (health <= 0)
visible_message("<span class='danger'>[src] sparks[target ? " and falls off of \the [target]!" : "!"] It is now completely unusable!</span>")
detach(0)
status = STATUS_BROKEN
update_icon()
return