shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into Projectile_Rework

Browse Source
This commit is contained in:
Solaris-Shade
2022-03-11 23:07:31 -05:00
committed by GitHub
parent a478945424 67fb160e66
commit 0395ba47d7
285 changed files with 5722 additions and 10058 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/scooter.dm
+2 -2
View File
@@ -102,7 +102,7 @@
var/atom/throw_target = get_edge_target_turf(H, pick(GLOB.cardinals))
unbuckle_mob(H)
H.throw_at(throw_target, 3, 2)
var/head_slot = H.get_item_by_slot(SLOT_HEAD)
var/head_slot = H.get_item_by_slot(ITEM_SLOT_HEAD)
if(!head_slot || !(istype(head_slot,/obj/item/clothing/head/helmet) || istype(head_slot,/obj/item/clothing/head/hardhat)))
H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
H.updatehealth()
@@ -281,7 +281,7 @@
H.throw_at(throw_target, 4, 3)
H.DefaultCombatKnockdown(30)
H.adjustStaminaLoss(30)
var/head_slot = H.get_item_by_slot(SLOT_HEAD)
var/head_slot = H.get_item_by_slot(ITEM_SLOT_HEAD)
if(!head_slot || !(istype(head_slot,/obj/item/clothing/head/helmet) || istype(head_slot,/obj/item/clothing/head/hardhat)))
H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1)
H.updatehealth()