cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 10:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9863 from MrPerson/508_compilation

Browse Source 
Makes the game compile in byond version 508
This commit is contained in:
Jordie
2015-06-16 19:38:11 +10:00
parent 9a1c1ae7af 7c3cb399d0
commit 26d75cc5ba
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/slotmachine.dm
View File

@@ -293,14 +293,14 @@
return amount 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]"] var/value = coinvalues["[cointype]"]
while(amount >= value) while(amount >= value)
var/obj/item/weapon/coin/C = new cointype(loc) //DOUBLE THE PAIN var/obj/item/weapon/coin/C = new cointype(loc) //DOUBLE THE PAIN
amount -= value amount -= value
if(throw && target) if(throwit && target)
C.throw_at(target, 3, 10) C.throw_at(target, 3, 10)
else else
random_step(C, 2, 40) random_step(C, 2, 40)

3
code/game/objects/items/weapons/melee/energy.dm
View File

@@ -185,8 +185,5 @@
/obj/item/weapon/melee/energy/blade/dropped() /obj/item/weapon/melee/energy/blade/dropped()
qdel(src) qdel(src)
/obj/item/weapon/melee/energy/blade/proc/throw()
qdel(src)
/obj/item/weapon/melee/energy/blade/attack_self(mob/user) /obj/item/weapon/melee/energy/blade/attack_self(mob/user)
return return

2
code/modules/mob/living/carbon/carbon.dm
View File

@@ -251,7 +251,7 @@
if(istype(item, /obj/item/weapon/grab)) if(istype(item, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = item 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. qdel(G) //We delete the grab, as it needs to stay around until it's returned.
if(ismob(item)) if(ismob(item))
var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors

2
code/modules/mob/mob_grab.dm
View File

@@ -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. //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)
if(affecting.buckled) if(affecting.buckled)
return null return null