cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes bsa not showing up (#1396)

Browse Source
This commit is contained in:
CitadelStationBot
2017-06-04 11:03:30 -05:00
committed by kevinz000
parent 13767b91ad
commit e59e7f8d06
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/effects/mines.dm
View File

@@ -127,8 +127,8 @@
var/pure_red = list(0,0,0,0,0,0,0,0,0,1,0,0) var/pure_red = list(0,0,0,0,0,0,0,0,0,1,0,0)
spawn(0) spawn(0)
new /obj/effect/hallucination/delusion(victim.loc,victim,force_kind="demon",duration=duration,skip_nearby=0) new /obj/effect/hallucination/delusion(victim.loc,victim,"demon",duration,0)
var/obj/item/weapon/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc) var/obj/item/weapon/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc)
chainsaw.flags |= NODROP chainsaw.flags |= NODROP
victim.drop_all_held_items() victim.drop_all_held_items()

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

@@ -437,7 +437,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
var/list/image/delusions = list() var/list/image/delusions = list()
/obj/effect/hallucination/delusion/Initialize(mapload, mob/living/carbon/T,force_kind = null , duration = 300,skip_nearby = 1, custom_icon = null, custom_icon_file = null) /obj/effect/hallucination/delusion/Initialize(mapload, mob/living/carbon/T,force_kind = null , duration = 300,skip_nearby = 1, custom_icon = null, custom_icon_file = null)
..() . = ..()
target = T target = T
var/image/A = null var/image/A = null
var/kind = force_kind ? force_kind : pick("clown","corgi","carp","skeleton","demon","zombie") var/kind = force_kind ? force_kind : pick("clown","corgi","carp","skeleton","demon","zombie")

2
code/modules/mob/living/simple_animal/guardian/types/fire.dm
View File

@@ -21,7 +21,7 @@
/mob/living/simple_animal/hostile/guardian/fire/AttackingTarget() /mob/living/simple_animal/hostile/guardian/fire/AttackingTarget()
. = ..() . = ..()
if(. && ishuman(target) && target != summoner) if(. && ishuman(target) && target != summoner)
new /obj/effect/hallucination/delusion(target.loc,target,force_kind="custom",duration=200,skip_nearby=0, custom_icon = src.icon_state, custom_icon_file = src.icon) new /obj/effect/hallucination/delusion(target.loc,target,"custom",200,0, icon_state,icon)
/mob/living/simple_animal/hostile/guardian/fire/Crossed(AM as mob|obj) /mob/living/simple_animal/hostile/guardian/fire/Crossed(AM as mob|obj)
..() ..()

2
code/modules/station_goals/bsa.dm
View File

@@ -326,7 +326,7 @@
var/datum/effect_system/smoke_spread/s = new var/datum/effect_system/smoke_spread/s = new
s.set_up(4,get_turf(centerpiece)) s.set_up(4,get_turf(centerpiece))
s.start() s.start()
var/obj/machinery/bsa/full/cannon = new(get_turf(centerpiece),cannon_direction=centerpiece.get_cannon_direction()) var/obj/machinery/bsa/full/cannon = new(get_turf(centerpiece),centerpiece.get_cannon_direction())
qdel(centerpiece.front) qdel(centerpiece.front)
qdel(centerpiece.back) qdel(centerpiece.back)
qdel(centerpiece) qdel(centerpiece)

2
code/modules/surgery/organs/vocal_cords.dm
View File

@@ -292,7 +292,7 @@
cooldown = COOLDOWN_MEME cooldown = COOLDOWN_MEME
for(var/V in listeners) for(var/V in listeners)
var/mob/living/L = V var/mob/living/L = V
new /obj/effect/hallucination/delusion(get_turf(L),L,duration=150 * power_multiplier,skip_nearby=0) new /obj/effect/hallucination/delusion(get_turf(L),L,null,150 * power_multiplier,0)
//WAKE UP //WAKE UP
else if((findtext(message, wakeup_words))) else if((findtext(message, wakeup_words)))

2
code/modules/surgery/prosthetic_replacement.dm
View File

@@ -82,7 +82,7 @@
target_zone == "r_arm" ? target.put_in_r_hand(new_arm) : target.put_in_l_hand(new_arm) target_zone == "r_arm" ? target.put_in_r_hand(new_arm) : target.put_in_l_hand(new_arm)
return 1 return 1
else if(istype(tool, /obj/item/weapon/melee/synthetic_arm_blade)) else if(istype(tool, /obj/item/weapon/melee/synthetic_arm_blade))
var/obj/item/weapon/melee/arm_blade/new_arm = new(target, silent = TRUE, synthetic = TRUE) var/obj/item/weapon/melee/arm_blade/new_arm = new(target,TRUE,TRUE)
target_zone == "r_arm" ? target.put_in_r_hand(new_arm) : target.put_in_l_hand(new_arm) target_zone == "r_arm" ? target.put_in_r_hand(new_arm) : target.put_in_l_hand(new_arm)
return 1 return 1