cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ghost bar (#22368)

Browse Source 
* Ghost bar initial changes

* more changes

* we ball again brothers

* we are (once again) SO back

* Update code/modules/admin/verbs/debug.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/_onclick/hud/alert.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/_onclick/hud/alert.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/modules/ruins/ghost_bar.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/ruins/ghost_bar.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/ruins/ghost_bar.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/ruins/ghost_bar.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/ruins/ghost_bar.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/weapons/cards_ids.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* deck of cards and shittt

* global placement

* Update code/modules/ruins/ghost_bar.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* readded

* hotfix

* zamn

* fixes

* greyfix

* last of the fixes

* can't stop me baby

* bam

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
GDN
2023-10-09 19:47:17 +01:00
committed by GitHub
co-authored by Luc Henri215
parent b02ce067bf
commit 6df2c2e3d2
72 changed files with 2640 additions and 1123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/abductor_event.dm
+4 -2
View File
@@ -21,9 +21,9 @@
else
temp = new
var/agent_mind = pick(candidates)
var/mob/agent_mind = pick(candidates)
candidates -= agent_mind
var/scientist_mind = pick(candidates)
var/mob/scientist_mind = pick(candidates)
var/mob/living/carbon/human/agent=makeBody(agent_mind)
var/mob/living/carbon/human/scientist=makeBody(scientist_mind)
@@ -41,6 +41,8 @@
temp.abductors |= list(agent_mind,scientist_mind)
temp.make_abductor_team(number,preset_scientist=scientist_mind,preset_agent=agent_mind)
temp.post_setup_team(number)
dust_if_respawnable(agent_mind)
dust_if_respawnable(scientist)
SSticker.mode.abductor_teams++
code/modules/events/alien_infestation.dm
+1 -1
View File
@@ -30,10 +30,10 @@
var/obj/vent = pick_n_take(vents)
var/mob/C = pick_n_take(candidates)
if(C)
C.remove_from_respawnable_list()
var/mob/living/carbon/alien/larva/new_xeno = new(vent.loc)
new_xeno.amount_grown += (0.75 * new_xeno.max_grown) //event spawned larva start off almost ready to evolve.
new_xeno.key = C.key
dust_if_respawnable(C)
new_xeno.forceMove(vent)
new_xeno.add_ventcrawl(vent)
if(SSticker && SSticker.mode)
code/modules/events/blob/blob_powers.dm
+1
View File
@@ -240,6 +240,7 @@
var/mob/C = pick(candidates)
if(C)
blobber.key = C.key
dust_if_respawnable(C)
to_chat(blobber, "<span class='biggerdanger'>You are a blobbernaut! You must assist all blob lifeforms in their mission to consume everything!</span>")
to_chat(blobber, "<span class='danger'>You heal while standing on blob structures, however you will decay slowly if you are damaged outside of the blob.</span>")
if(!blobber.ckey)
code/modules/events/blob/blob_structures/blob_core.dm
+1
View File
@@ -119,6 +119,7 @@
var/mob/camera/blob/B = new(loc)
B.is_offspring = is_offspring
B.key = C.key
dust_if_respawnable(C)
B.blob_core = src
overmind = B
color = overmind.blob_reagent_datum.color
code/modules/events/blob_spawn.dm
+1
View File
@@ -25,6 +25,7 @@
var/mob/living/simple_animal/mouse/blobinfected/B = new(vent.loc)
var/mob/M = pick(candidates)
B.key = M.key
dust_if_respawnable(M)
B.mind.special_role = SPECIAL_ROLE_BLOB
B.forceMove(vent)
B.add_ventcrawl(vent)
code/modules/events/sentience.dm
+1
View File
@@ -24,6 +24,7 @@
var/mob/SG = pick(candidates)
SA.key = SG.key
dust_if_respawnable(SG)
SA.universal_speak = TRUE
SA.sentience_act()
SA.can_collar = TRUE
code/modules/events/slaughterevent.dm
+1
View File
@@ -17,6 +17,7 @@
var/datum/mind/player_mind = new /datum/mind(key_of_slaughter)
player_mind.active = TRUE
dust_if_respawnable(C)
var/turf/spawn_loc = get_spawn_loc(player_mind.current)
var/obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(spawn_loc)
var/mob/living/simple_animal/demon/S = new demon(holder)
code/modules/events/spider_terror.dm
+1
View File
@@ -64,6 +64,7 @@
var/mob/living/simple_animal/hostile/poison/terror_spider/S = new spider_type(vent.loc)
var/mob/M = pick_n_take(candidates)
S.key = M.key
dust_if_respawnable(M)
if(infestation_type != PRINCE_SPIDER)
S.forceMove(vent)
S.add_ventcrawl(vent)
code/modules/events/traders.dm
+1 -1
View File
@@ -53,9 +53,9 @@ GLOBAL_LIST_INIT(unused_trade_stations, list("sol"))
var/mob/C = pick_n_take(candidates)
spawn_count--
if(C)
C.remove_from_respawnable_list()
var/mob/living/carbon/human/M = new /mob/living/carbon/human(picked_loc)
M.ckey = C.ckey // must be before equipOutfit, or that will runtime due to lack of mind
dust_if_respawnable(C)
M.equipOutfit(/datum/outfit/admin/sol_trader)
M.dna.species.after_equip_job(null, M)
for(var/datum/objective/O in trader_objectives)