cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into diagonal-movement

Browse Source
This commit is contained in:
Couls
2019-05-22 14:24:54 -04:00
committed by GitHub
parent 7860db2afb 4846a17bcf
commit fe68c74466
497 changed files with 10268 additions and 9477 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cable.dm
+1 -1
View File
@@ -35,7 +35,7 @@ By design, d1 is the smallest direction and d2 is the highest
icon_state = "0-1"
var/d1 = 0
var/d2 = 1
layer = 2.44 //Just below unary stuff, which is at 2.45 and above pipes, which are at 2.4
layer = WIRE_LAYER //Just below unary stuff, which is at 2.45 and above pipes, which are at 2.4
color = COLOR_RED
/obj/structure/cable/yellow
code/modules/power/singularity/narsie.dm
+5 -5
View File
@@ -25,8 +25,8 @@
/obj/singularity/narsie/large/New()
..()
icon_state = ticker.cultdat.entity_icon_state
name = ticker.cultdat.entity_name
icon_state = SSticker.cultdat.entity_icon_state
name = SSticker.cultdat.entity_name
to_chat(world, "<font size='15' color='red'><b> [name] HAS RISEN</b></font>")
world << pick(sound('sound/hallucinations/im_here1.ogg'), sound('sound/hallucinations/im_here2.ogg'))
@@ -127,12 +127,12 @@
/obj/singularity/narsie/proc/acquire(var/mob/food)
if(food == target)
return
to_chat(target, "<span class='cultlarge'>[uppertext(ticker.cultdat.entity_name)] HAS LOST INTEREST IN YOU</span>")
to_chat(target, "<span class='cultlarge'>[uppertext(SSticker.cultdat.entity_name)] HAS LOST INTEREST IN YOU</span>")
target = food
if(ishuman(target))
to_chat(target, "<span class ='cultlarge'>[uppertext(ticker.cultdat.entity_name)] HUNGERS FOR YOUR SOUL</span>")
to_chat(target, "<span class ='cultlarge'>[uppertext(SSticker.cultdat.entity_name)] HUNGERS FOR YOUR SOUL</span>")
else
to_chat(target, "<span class ='cultlarge'>[uppertext(ticker.cultdat.entity_name)] HAS CHOSEN YOU TO LEAD HER TO HER NEXT MEAL</span>")
to_chat(target, "<span class ='cultlarge'>[uppertext(SSticker.cultdat.entity_name)] HAS CHOSEN YOU TO LEAD HER TO HER NEXT MEAL</span>")
//Wizard narsie
/obj/singularity/narsie/wizard
code/modules/power/smes.dm
+1 -1
View File
@@ -198,7 +198,7 @@
return 0
/obj/machinery/power/smes/Destroy()
if(ticker && ticker.current_state == GAME_STATE_PLAYING)
if(SSticker && SSticker.current_state == GAME_STATE_PLAYING)
var/area/area = get_area(src)
if(area)
message_admins("SMES deleted at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>[area.name]</a>)")