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

Remove drop_item, drop_item_v, put_in_hands_or_del

Browse Source
This commit is contained in:
Jordan Brown
2017-10-07 13:36:33 -04:00
committed by CitadelStationBot
parent 5f4b3594d0
commit 075cb673c0
152 changed files with 1778 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/drug_reagents.dm
+2 -6
View File
@@ -189,9 +189,7 @@
M.emote("laugh")
if(prob(33))
M.visible_message("<span class='danger'>[M]'s hands flip out and flail everywhere!</span>")
var/obj/item/I = M.get_active_held_item()
if(I)
M.drop_item()
M.drop_all_held_items()
..()
M.adjustToxLoss(1, 0)
M.adjustBrainLoss(pick(0.5, 0.6, 0.7, 0.8, 0.9, 1))
@@ -268,9 +266,7 @@
if(prob(20))
M.emote(pick("twitch","drool","moan"))
if(prob(33))
var/obj/item/I = M.get_active_held_item()
if(I)
M.drop_item()
M.drop_all_held_items()
..()
/datum/reagent/drug/bath_salts/addiction_act_stage1(mob/living/M)
code/modules/reagents/chemistry/reagents/food_reagents.dm
-2
View File
@@ -256,7 +256,6 @@
victim.confused = max(M.confused, 3)
victim.damageoverlaytemp = 60
victim.Knockdown(60)
victim.drop_item()
return
else if ( eyes_covered ) // Eye cover is better than mouth cover
victim.blur_eyes(3)
@@ -270,7 +269,6 @@
victim.confused = max(M.confused, 6)
victim.damageoverlaytemp = 75
victim.Knockdown(100)
victim.drop_item()
victim.update_damage_hud()
/datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/M)
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+5 -16
View File
@@ -626,27 +626,20 @@
/datum/reagent/medicine/morphine/overdose_process(mob/living/M)
if(prob(33))
var/obj/item/I = M.get_active_held_item()
if(I)
M.drop_item()
M.drop_all_held_items()
M.Dizzy(2)
M.Jitter(2)
..()
/datum/reagent/medicine/morphine/addiction_act_stage1(mob/living/M)
if(prob(33))
var/obj/item/I = M.get_active_held_item()
if(I)
M.drop_item()
M.Dizzy(2)
M.drop_all_held_items()
M.Jitter(2)
..()
/datum/reagent/medicine/morphine/addiction_act_stage2(mob/living/M)
if(prob(33))
var/obj/item/I = M.get_active_held_item()
if(I)
M.drop_item()
M.drop_all_held_items()
M.adjustToxLoss(1*REM, 0)
. = 1
M.Dizzy(3)
@@ -655,9 +648,7 @@
/datum/reagent/medicine/morphine/addiction_act_stage3(mob/living/M)
if(prob(33))
var/obj/item/I = M.get_active_held_item()
if(I)
M.drop_item()
M.drop_all_held_items()
M.adjustToxLoss(2*REM, 0)
. = 1
M.Dizzy(4)
@@ -666,9 +657,7 @@
/datum/reagent/medicine/morphine/addiction_act_stage4(mob/living/M)
if(prob(33))
var/obj/item/I = M.get_active_held_item()
if(I)
M.drop_item()
M.drop_all_held_items()
M.adjustToxLoss(3*REM, 0)
. = 1
M.Dizzy(5)