cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-13 17:14:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Constructs get named-numbers now so you can actually tell who's being a gryphon/reading WGW over the radio.

Browse Source 
Tweaks to Newsie
This commit is contained in:
Cheridan
2013-08-15 14:35:04 -05:00
parent 1cbc9dbee0
commit 62a6a02db9
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/constructs.dm
+5 -2
View File
@@ -1,7 +1,7 @@
/mob/living/simple_animal/construct
name = "Construct"
real_name = "Contruct"
real_name = "Construct"
desc = ""
speak_emote = list("hisses")
emote_hear = list("wails","screeches")
@@ -25,6 +25,9 @@
minbodytemp = 0
faction = "cult"
/mob/living/simple_animal/construct/New()
name = text("[initial(name)] ([rand(1, 1000)])")
real_name = name
/mob/living/simple_animal/construct/Life()
..()
@@ -255,7 +258,7 @@
var/energy = 0
var/max_energy = 1000
/mob/living/simple_animal/constructbehemoth/attackby(var/obj/item/O as obj, var/mob/user as mob)
/mob/living/simple_animal/construct/behemoth/attackby(var/obj/item/O as obj, var/mob/user as mob)
if(O.force)
if(O.force >= 11)
var/damage = O.force
code/modules/power/singularity/singularity.dm
+7 -8
View File
@@ -452,7 +452,7 @@ var/global/list/uneatable = list(
/obj/machinery/singularity/narsie //Moving narsie to a child object of the singularity so it can be made to function differently. --NEO
name = "Nar-Sie"
name = "Nar-sie's Avatar"
desc = "Your mind begins to bubble and ooze as it tries to comprehend what it sees."
icon = 'icons/obj/magic_terror.dmi'
pixel_x = -89
@@ -461,8 +461,8 @@ var/global/list/uneatable = list(
contained = 0 //Are we going to move around?
dissipate = 0 //Do we lose energy over time?
move_self = 1 //Do we move on our own?
grav_pull = 10 //How many tiles out do we pull?
consume_range = 3 //How many tiles out do we eat
grav_pull = 5 //How many tiles out do we pull?
consume_range = 6 //How many tiles out do we eat
/obj/machinery/singularity/narsie/large
name = "Nar-Sie"
@@ -472,6 +472,7 @@ var/global/list/uneatable = list(
pixel_y = -256
current_size = 12
move_self = 1 //Do we move on our own?
grav_pull = 10
consume_range = 12 //How many tiles out do we eat
/obj/machinery/singularity/narsie/large/New()
@@ -509,11 +510,9 @@ var/global/list/uneatable = list(
/obj/machinery/singularity/narsie/mezzer()
for(var/mob/living/carbon/human/M in oviewers(8, src))
for(var/mob/living/carbon/M in oviewers(8, src))
if(M.stat == CONSCIOUS)
if(iscultist(M))
continue
else
if(!iscultist(M))
M << "\red You feel your sanity crumble away in an instant as you gaze upon [src.name]..."
M.apply_effect(3, STUN)
@@ -524,7 +523,7 @@ var/global/list/uneatable = list(
if(istype(A,/mob/living/))
var/mob/living/C = A
if(!iscultist(C))//if someone's not a cultist (includes constructs/cult xenos/whatever)
if(!iscultist(C))//TODO: Make Narsie reward her cultists with transformation into a construct.
C.dust()
if(isturf(A))