From 7c3cb399d0caf8c1e19a6d9ec2596ae061c63d6e Mon Sep 17 00:00:00 2001 From: MrPerson Date: Tue, 9 Jun 2015 04:14:12 -0700 Subject: [PATCH] Makes the game compile in byond version 508 throw is a reserved keyword so all throw() and var/throw had to be renamed. Only compile tested because I'm fucking lazy. --- code/game/machinery/slotmachine.dm | 4 ++-- code/game/objects/items/weapons/melee/energy.dm | 3 --- code/modules/mob/living/carbon/carbon.dm | 2 +- code/modules/mob/mob_grab.dm | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index 0bc33615834..5af17c44572 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -293,14 +293,14 @@ return amount -/obj/machinery/computer/slot_machine/proc/dispense(amount = 0, cointype = /obj/item/weapon/coin/silver, mob/living/target, throw = 0) +/obj/machinery/computer/slot_machine/proc/dispense(amount = 0, cointype = /obj/item/weapon/coin/silver, mob/living/target, throwit = 0) var/value = coinvalues["[cointype]"] while(amount >= value) var/obj/item/weapon/coin/C = new cointype(loc) //DOUBLE THE PAIN amount -= value - if(throw && target) + if(throwit && target) C.throw_at(target, 3, 10) else random_step(C, 2, 40) diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 886ce709f86..81ac92e29f0 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -185,8 +185,5 @@ /obj/item/weapon/melee/energy/blade/dropped() qdel(src) -/obj/item/weapon/melee/energy/blade/proc/throw() - qdel(src) - /obj/item/weapon/melee/energy/blade/attack_self(mob/user) return diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index bae07c42c8d..9ed89408ccd 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -251,7 +251,7 @@ if(istype(item, /obj/item/weapon/grab)) var/obj/item/weapon/grab/G = item - item = G.throw() //throw the person instead of the grab + item = G.get_mob_if_throwable() //throw the person instead of the grab qdel(G) //We delete the grab, as it needs to stay around until it's returned. if(ismob(item)) var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 233fcd4f485..45f84087221 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -47,7 +47,7 @@ ..() //Used by throw code to hand over the mob, instead of throwing the grab. The grab is then deleted by the throw code. -/obj/item/weapon/grab/proc/throw() +/obj/item/weapon/grab/proc/get_mob_if_throwable() if(affecting) if(affecting.buckled) return null