cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hallucinations now use the old system again, but with the more modern components.

Browse Source
This commit is contained in:
Mechoid
2018-08-06 00:58:29 -07:00
parent 12a1d6e949
commit c9ef8f1fef
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/modules/flufftext/Hallucination.dm
View File

@@ -349,19 +349,22 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
/obj/item/clothing/suit/space/void, /obj/item/weapon/tank) /obj/item/clothing/suit/space/void, /obj/item/weapon/tank)
/proc/fake_attack(var/mob/living/target) /proc/fake_attack(var/mob/living/target)
// var/list/possible_clones = new/list() var/list/possible_clones = new/list()
var/mob/living/carbon/human/clone = null var/mob/living/carbon/human/clone = null
var/clone_weapon = null var/clone_weapon = null
for(var/mob/living/carbon/human/H in living_mob_list) for(var/mob/living/carbon/human/H in living_mob_list)
if(H.stat || H.lying) continue if(H.stat || H.lying)
// possible_clones += H continue
clone = H possible_clones += H
break //changed the code a bit. Less randomised, but less work to do. Should be ok, world.contents aren't stored in any particular order. // clone = H
// break //changed the code a bit. Less randomised, but less work to do. Should be ok, world.contents aren't stored in any particular order.
// if(!possible_clones.len) return if(!possible_clones.len)
// clone = pick(possible_clones) return
if(!clone) return clone = pick(possible_clones)
if(!clone)
return
//var/obj/effect/fake_attacker/F = new/obj/effect/fake_attacker(outside_range(target)) //var/obj/effect/fake_attacker/F = new/obj/effect/fake_attacker(outside_range(target))
var/obj/effect/fake_attacker/F = new/obj/effect/fake_attacker(target.loc) var/obj/effect/fake_attacker/F = new/obj/effect/fake_attacker(target.loc)

7
html/changelogs/Mechoid - Hallucinations.yml Normal file
View File

@@ -0,0 +1,7 @@
author: Mechoid
delete-after: True
changes:
- rsctweak: "Hallucinations are no longer only Pun Pun."