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

Adds Shadow demons (#19732)

Browse Source 
* reshuffle

* shared base type

* moves this to the base type

* the monster

* event

* FUCK

* better sprites

* refactors bloodcrawl, more nice sprites

* review stuff

* Apply suggestions from code review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* heart of darkness

* pre TM tweaks

* ARGH

* hopefully fixes double hits

* tweaks

* derp

* tweaks

* TEMP RUNTIME REMOVE LATER

* fixes

* runtime fixes

* cig runtime fix

* review + another runtime fix

* re adds sprite

* removes runtime

* oop I forgor

* DRUNK CODING

* SPRITES

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
This commit is contained in:
Charlie
2022-12-29 11:26:37 -06:00
committed by GitHub
co-authored by Sirryan2002
parent 7be765d5ef
commit 8ef4aa727e
48 changed files with 563 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/observer/orbit.dm
+2 -2
View File
@@ -134,9 +134,9 @@
var/list/antag_serialized = serialized.Copy()
antag_serialized["antag"] = "Xenomorph"
antagonists += list(antag_serialized)
else if(isslaughterdemon(M))
else if(isdemon(M))
var/list/antag_serialized = serialized.Copy()
antag_serialized["antag"] = "Slaughter Demon"
antag_serialized["antag"] = "Demon"
antagonists += list(antag_serialized)
else
if(length(orbiters) >= 0.2 * length_of_ghosts) // If a bunch of people are orbiting an object, like the nuke disk.
code/modules/mob/living/carbon/human/human.dm
+1 -1
View File
@@ -1966,7 +1966,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
to_chat(src, "<span class='whisper'>[pick(GLOB.boo_phrases)]</span>")
return TRUE
/mob/living/carbon/human/extinguish_light()
/mob/living/carbon/human/extinguish_light(force = FALSE)
// Parent function handles stuff the human may be holding
..()
code/modules/mob/living/living.dm
+2 -2
View File
@@ -1092,10 +1092,10 @@
/mob/living/proc/fakefire()
return
/mob/living/extinguish_light()
/mob/living/extinguish_light(force = FALSE)
for(var/atom/A in src)
if(A.light_range > 0)
A.extinguish_light()
A.extinguish_light(force)
/mob/living/vv_edit_var(var_name, var_value)
switch(var_name)
code/modules/mob/living/living_defines.dm
-2
View File
@@ -42,8 +42,6 @@
var/mob_biotypes = MOB_ORGANIC
var/metabolism_efficiency = 1 //more or less efficiency to metabolize helpful/harmful reagents and regulate body temperature..
var/holder = null //The holder for blood crawling
var/ventcrawler = 0 //0 No vent crawling, 1 vent crawling in the nude, 2 vent crawling always
var/list/icon/pipes_shown = list()
var/last_played_vent
code/modules/mob/living/silicon/pai/pai.dm
+1 -1
View File
@@ -515,7 +515,7 @@
CRASH("pAI without card")
loc = card
/mob/living/silicon/pai/extinguish_light()
/mob/living/silicon/pai/extinguish_light(force = FALSE)
flashlight_on = FALSE
set_light(0)
card.set_light(0)
code/modules/mob/living/silicon/robot/robot.dm
+1 -1
View File
@@ -1473,7 +1473,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
overlays += "[base_icon]-shield"
/mob/living/silicon/robot/extinguish_light()
/mob/living/silicon/robot/extinguish_light(force = FALSE)
update_headlamp(1, 150)
/mob/living/silicon/robot/rejuvenate()