refactors narsie to use the object oriented programming meme

This commit is contained in:
Hornygranny
2014-12-18 11:44:20 -08:00
parent 5561eed274
commit cd22bfc11f
9 changed files with 30 additions and 24 deletions
+4 -1
View File
@@ -395,4 +395,7 @@ var/list/blood_splatter_icons = list()
return
/atom/proc/emag_act()
return
return
/atom/proc/narsie_act()
return
+4
View File
@@ -158,3 +158,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
make_plating()
else if(prob(50))
ReplaceWithLattice()
/turf/simulated/floor/narsie_act()
if(prob(20))
ChangeTurf(/turf/simulated/floor/engine/cult)
@@ -110,6 +110,9 @@
name = "engraved floor"
icon_state = "cult"
/turf/simulated/floor/engine/cult/narsie_act()
return
/turf/simulated/floor/engine/n20/New()
..()
var/datum/gas_mixture/adding = new
+5 -1
View File
@@ -286,4 +286,8 @@
return
if(current_size == STAGE_FOUR)
if(prob(30))
dismantle_wall()
dismantle_wall()
/turf/simulated/wall/narsie_act()
if(prob(20))
ChangeTurf(/turf/simulated/wall/cult)
+3
View File
@@ -13,6 +13,9 @@
new /obj/effect/decal/cleanable/blood(src)
new /obj/effect/decal/remains/human(src)
/turf/simulated/wall/cult/narsie_act()
return
/turf/simulated/wall/vault
icon_state = "rockvault"
@@ -163,7 +163,7 @@ var/sc_safecode5 = "[rand(0,9)]"
desc = "Your body becomes weak and your feel your mind slipping away as you try to comprehend what you know can't be possible."
move_self = 0 //Contianed narsie does not move!
grav_pull = 0 //Contained narsie does not pull stuff in!
var/uneatable = list(/turf/space, /obj/effect/overlay, /mob/living/simple_animal/construct)
//Override this to prevent no adminlog runtimes and admin warnings about a singularity without containment
/obj/singularity/narsie/sc_Narsie/admin_investigate_setup()
return
+7
View File
@@ -760,6 +760,13 @@
/mob/living/singularity_pull(S)
step_towards(src,S)
/mob/living/narsie_act()
if(client)
makeNewConstruct(/mob/living/simple_animal/construct/harvester, src, null, 1)
spawn_dust()
gib()
return
/mob/living/proc/do_attack_animation(atom/A)
var/pixel_x_diff = 0
var/pixel_y_diff = 0
@@ -70,7 +70,8 @@
Proj.on_hit(src, 0)
return 0
/mob/living/simple_animal/construct/narsie_act()
return
/////////////////Juggernaut///////////////
+1 -20
View File
@@ -10,7 +10,6 @@
move_self = 1 //Do we move on our own?
grav_pull = 5 //How many tiles out do we pull?
consume_range = 6 //How many tiles out do we eat
var/uneatable = list(/turf/space, /obj/effect/overlay, /mob/living/simple_animal/construct)
/obj/singularity/narsie/large
name = "Nar-Sie"
@@ -84,25 +83,7 @@
/obj/singularity/narsie/consume(var/atom/A)
if(is_type_in_list(A, uneatable))
return 0
if(istype(A,/mob/living/))
var/mob/living/C = A
if(C.client)
makeNewConstruct(/mob/living/simple_animal/construct/harvester, C, null, 1)
C.spawn_dust()
C.gib()
return
if(isturf(A))
var/turf/T = A
if(istype(T, /turf/simulated/floor) && !istype(T, /turf/simulated/floor/engine/cult))
if(prob(20)) T.ChangeTurf(/turf/simulated/floor/engine/cult)
else if(istype(T,/turf/simulated/wall) && !istype(T, /turf/simulated/wall/cult))
if(prob(20)) T.ChangeTurf(/turf/simulated/wall/cult)
return
A.narsie_act()
/obj/singularity/narsie/ex_act() //No throwing bombs at it either. --NEO