diff --git a/code/datums/components/clickplace.dm b/code/datums/components/clickplace.dm index fec10c59639..a650ee0395e 100644 --- a/code/datums/components/clickplace.dm +++ b/code/datums/components/clickplace.dm @@ -198,7 +198,7 @@ victim.apply_damage(8, def_zone = BP_HEAD) victim.visible_message("[assailant] slams [victim]'s face against \the [A]!") playsound(parent, 'sound/weapons/tablehit1.ogg', VOL_EFFECTS_MASTER) - + SEND_SIGNAL(assailant, COMSIG_HUMAN_HARMED_OTHER,victim ) victim.log_combat(assailant, "face-slammed against \the [parent]") return FALSE @@ -227,8 +227,7 @@ INVOKE_ASYNC(victim, TYPE_PROC_REF(/atom/movable, do_simple_move_animation), A.loc, old_loc) victim.Stun(2) victim.Weaken(5) - - victim.log_combat(assailant, "laid on [A]") + victim.process_aggresive_action(assailant, "laid on [A]") else if(assailant.a_intent != INTENT_HARM) /// Let's pretend a face-slam doesn't exist. to_chat(assailant, "You need a better grip to do that!") diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 03999ec2d62..6e0abf7d731 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -63,6 +63,11 @@ var/creation_time = 0 //World time when this datum was New'd. Useful to tell how long since a character spawned var/creation_roundtime + // Pluvia sochial credit system + var/social_credit = 0 + var/haram_point = 0 + var/blessed = 0 + var/willpower_amount = 1 var/possible_willpower_effects = list(/datum/willpower_effect/painkiller, /datum/willpower_effect/skills, /datum/willpower_effect/nutrition, /datum/willpower_effect/fat) var/willpower_effects = list() @@ -782,6 +787,9 @@ ..() if(!mind.assigned_role) mind.assigned_role = "default" //default + mind.social_credit = species.start_social_credit //Pluvia social credit system + if(ispluvian(src)) + global.pluvia_religion.add_member(src, HOLY_ROLE_PRIEST) //slime /mob/living/carbon/slime/mind_initialize() diff --git a/icons/hud/actions.dmi b/icons/hud/actions.dmi index e44517488eb..7190ad53d1d 100644 Binary files a/icons/hud/actions.dmi and b/icons/hud/actions.dmi differ diff --git a/icons/hud/screen_alert.dmi b/icons/hud/screen_alert.dmi index 9291d60fbca..2a1ea35f33a 100644 Binary files a/icons/hud/screen_alert.dmi and b/icons/hud/screen_alert.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index e0fe840d8a3..7d6a08d82fe 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index f39fd47cf4a..406ac97484c 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index daed1bf6df7..bf79e86b768 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index fd95ed81ce0..9d39707538d 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/mob/uniform_fat.dmi b/icons/mob/uniform_fat.dmi index 71df0feacb8..cabbdbe1a4a 100644 Binary files a/icons/mob/uniform_fat.dmi and b/icons/mob/uniform_fat.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 29188c0a964..b4b47b374a3 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 23bd37babc4..e37e1aac4a3 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index bbc37434b58..f0f6d28612a 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 7eab2a0cc2b..ea543a359c6 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index f600c4b59f9..5d007769809 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ diff --git a/maps/centcom/centcom.dmm b/maps/centcom/centcom.dmm index c8f3f5f2010..29128a19cb6 100644 --- a/maps/centcom/centcom.dmm +++ b/maps/centcom/centcom.dmm @@ -12069,6 +12069,14 @@ icon_state = "wood" }, /area/custom/tophat) +"aAU" = ( +/obj/item/weapon/dnainjector/h2m, +/obj/structure/rack, +/obj/item/weapon/dnainjector/h2m, +/obj/item/weapon/dnainjector/h2m, +/obj/item/weapon/dnainjector/h2m, +/turf/unsimulated/floor, +/area/space) "aAV" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/spray/cleaner{ @@ -19479,6 +19487,11 @@ }, /turf/unsimulated/floor, /area/centcom/holding) +"aTH" = ( +/turf/unsimulated/floor{ + icon_state = "Heaven_Stairs2_wide" + }, +/area/space) "aTJ" = ( /turf/unsimulated/floor{ icon_state = "white" @@ -19998,6 +20011,10 @@ icon_state = "dark" }, /area/centcom/evac) +"aVL" = ( +/obj/machinery/door/window/southright, +/turf/simulated/floor, +/area/space) "aVM" = ( /obj/structure/window/shuttle/reinforced/evac{ icon_state = "14,20" @@ -21892,6 +21909,12 @@ }, /turf/unsimulated/floor/abductor, /area/custom/abductor_ship) +"bdA" = ( +/obj/item/weapon/melee/pluvia_gong_baton, +/turf/unsimulated/floor{ + icon_state = "heavenfull2" + }, +/area/space) "bdC" = ( /turf/unsimulated/wall/abductor{ icon_state = "alien8" @@ -22440,6 +22463,15 @@ icon_state = "dark" }, /area/centcom/specops) +"biw" = ( +/obj/structure/table/rglass, +/obj/item/weapon/paper, +/obj/item/weapon/paper, +/obj/item/weapon/paper, +/obj/item/weapon/paper, +/obj/item/weapon/paper, +/turf/unsimulated/floor, +/area/space) "bkb" = ( /obj/structure/closet/crate/medical, /obj/item/weapon/reagent_containers/glass/bottle/stoxin, @@ -22483,6 +22515,11 @@ icon_state = "darkred" }, /area/custom/syndicate_mothership/droppod_garage) +"bnM" = ( +/turf/simulated/floor{ + icon_state = "Heaven_Stairs2_wide" + }, +/area/space) "bob" = ( /obj/structure/mopbucket, /obj/item/weapon/reagent_containers/glass/bucket, @@ -22583,6 +22620,22 @@ /obj/structure/cult/pylon, /turf/unsimulated/floor/cult/lava, /area/custom/cult) +"bsz" = ( +/obj/item/weapon/kitchen/utensil/fork/sticks, +/obj/structure/table/rglass, +/turf/unsimulated/floor, +/area/space) +"bsA" = ( +/obj/effect/light_emitter, +/turf/unsimulated/floor{ + icon_state = "heavenfull2" + }, +/area/space) +"bsF" = ( +/obj/effect/spawner/newbomb, +/obj/effect/light_emitter, +/turf/simulated/floor, +/area/space) "btb" = ( /obj/structure/table/woodentable{ dir = 5 @@ -22691,6 +22744,10 @@ icon_state = "dark" }, /area/centcom/specops) +"byR" = ( +/obj/effect/landmark/ancestor_wisp_start, +/turf/simulated/floor, +/area/space) "bzb" = ( /obj/structure/rack, /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster, @@ -23125,6 +23182,10 @@ }, /turf/unsimulated/floor/cult/lava, /area/custom/cult) +"cdG" = ( +/obj/structure/stool/bed/chair/metal, +/turf/unsimulated/floor, +/area/space) "ceb" = ( /obj/machinery/door_control{ id = "CKLoaddoor2"; @@ -23329,6 +23390,10 @@ icon_state = "vaultfull" }, /area/velocity) +"csx" = ( +/obj/structure/shuttle/window, +/turf/simulated/floor, +/area/space) "csA" = ( /obj/machinery/conveyor{ dir = 1; @@ -23494,6 +23559,12 @@ icon_state = "hydrofloor" }, /area/velocity) +"cGh" = ( +/obj/machinery/media/jukebox/bar, +/turf/unsimulated/floor{ + icon_state = "heavenfull" + }, +/area/space) "cHb" = ( /obj/machinery/light{ dir = 1 @@ -23502,6 +23573,10 @@ icon_state = "hydrofloor" }, /area/velocity) +"cHz" = ( +/obj/structure/table, +/turf/unsimulated/floor/carpet/blue2, +/area/space) "cIb" = ( /obj/machinery/firealarm{ pixel_y = 24 @@ -23595,6 +23670,12 @@ /obj/item/weapon/stamp/velocity, /turf/unsimulated/floor, /area/velocity) +"cOi" = ( +/turf/unsimulated/floor{ + dir = 1; + icon_state = "heaven" + }, +/area/space) "cOr" = ( /turf/environment/space, /area/shuttle/escape_pod5/centcom) @@ -23689,6 +23770,13 @@ opacity = 0 }, /area/custom/abductor_ship) +"cTv" = ( +/obj/effect/light_emitter, +/turf/unsimulated/floor{ + dir = 10; + icon_state = "heaven" + }, +/area/space) "cTM" = ( /obj/structure/table/woodentable, /obj/item/clothing/suit/straight_jacket, @@ -24239,6 +24327,10 @@ }, /turf/environment/space, /area/velocity/monorailwagon) +"dNj" = ( +/obj/structure/mirror/magic, +/turf/simulated/floor, +/area/space) "dOb" = ( /obj/structure/sign/warning/nosmoking{ pixel_x = -32 @@ -24252,7 +24344,6 @@ dir = 8; icon_state = "chair_c03" }, -/obj/effect/landmark/latejoin, /turf/simulated/shuttle/floor{ icon_state = "floor2" }, @@ -24372,11 +24463,21 @@ dir = 8; icon_state = "chair_c02" }, -/obj/effect/landmark/latejoin, /turf/simulated/shuttle/floor{ icon_state = "floor2" }, /area/velocity/monorailwagon) +"dWI" = ( +/obj/item/clothing/head/pluvia, +/obj/item/clothing/head/pluvia, +/obj/item/clothing/head/pluvia, +/obj/item/clothing/head/pluvia, +/obj/item/clothing/head/pluvia, +/obj/item/clothing/head/pluvia, +/obj/item/clothing/head/pluvia, +/obj/structure/rack, +/turf/simulated/floor, +/area/space) "dXb" = ( /obj/structure/shuttle/window{ icon_state = "2" @@ -24439,7 +24540,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/landmark/latejoin, /turf/simulated/shuttle/floor{ icon_state = "floor2" }, @@ -24469,6 +24569,10 @@ }, /turf/unsimulated/floor, /area/velocity) +"eek" = ( +/obj/item/weapon/gun/projectile/revolver/syndie, +/turf/unsimulated/desert, +/area/space) "efb" = ( /obj/effect/decal/turf_decal{ icon_state = "velocity_12" @@ -24530,7 +24634,6 @@ dir = 8; icon_state = "chair_c01" }, -/obj/effect/landmark/latejoin, /turf/simulated/shuttle/floor{ icon_state = "floor2" }, @@ -24821,6 +24924,12 @@ icon_state = "rampbottom" }, /area/velocity) +"eLJ" = ( +/obj/structure/table/rglass, +/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, +/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, +/turf/unsimulated/floor, +/area/space) "eMb" = ( /obj/machinery/light{ dir = 4 @@ -24978,6 +25087,12 @@ icon_state = "vel_wall04" }, /area/shuttle/officer/velocity) +"faF" = ( +/obj/structure/stool/bed/chair/wood/normal{ + dir = 1 + }, +/turf/unsimulated/floor/carpet/blue2, +/area/space) "fbb" = ( /obj/structure/window/thin/reinforced{ dir = 8 @@ -25003,6 +25118,14 @@ }, /turf/environment/space, /area/shuttle/officer/velocity) +"fcN" = ( +/obj/structure/rack, +/obj/item/clothing/suit/pluvia_trick, +/obj/item/clothing/suit/pluvia_trick, +/obj/item/clothing/suit/pluvia_trick, +/obj/item/clothing/suit/pluvia_trick, +/turf/simulated/floor, +/area/space) "fdb" = ( /obj/structure/window/fulltile/reinforced/indestructible{ icon_state = "gr_window_reinforced" @@ -25137,6 +25260,13 @@ }, /turf/environment/space, /area/shuttle/officer/velocity) +"fnH" = ( +/obj/structure/rack, +/obj/item/weapon/dnainjector/m2h, +/obj/item/weapon/dnainjector/m2h, +/obj/item/weapon/dnainjector/m2h, +/turf/unsimulated/floor, +/area/space) "fob" = ( /obj/machinery/conveyor{ dir = 8; @@ -25298,6 +25428,12 @@ oxygen = 21.8366 }, /area/shuttle/specops/centcom) +"fEa" = ( +/turf/unsimulated/floor{ + dir = 5; + icon_state = "heaven" + }, +/area/space) "fEb" = ( /obj/structure/sign/directions/security{ dir = 1 @@ -25429,6 +25565,19 @@ }, /turf/unsimulated/floor, /area/velocity) +"fRY" = ( +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/structure/rack, +/turf/simulated/floor, +/area/space) "fSb" = ( /obj/machinery/light/small{ dir = 8 @@ -25553,6 +25702,11 @@ icon_state = "dark" }, /area/centcom/specops) +"fZj" = ( +/obj/item/weapon/melee/baton, +/obj/structure/table/rglass, +/turf/unsimulated/floor, +/area/space) "gab" = ( /obj/machinery/door/airlock/external, /obj/machinery/door/poddoor{ @@ -25675,6 +25829,12 @@ icon_state = "engine" }, /area/velocity) +"gjJ" = ( +/turf/unsimulated/floor{ + dir = 4; + icon_state = "Heaven_Stairs_wide" + }, +/area/space) "gkb" = ( /obj/structure/sign/velocity_overlay{ desc = "Parking mark"; @@ -25769,6 +25929,10 @@ icon_state = "yellow" }, /area/centcom/specops) +"grc" = ( +/obj/structure/mineral_door/wood, +/turf/simulated/floor, +/area/space) "gsb" = ( /turf/unsimulated/floor{ dir = 4; @@ -26056,6 +26220,11 @@ icon_state = "dark" }, /area/centcom/specops) +"gKi" = ( +/turf/unsimulated/floor{ + icon_state = "heaven" + }, +/area/space) "gLb" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/decal/turf_decal/alpha/gray{ @@ -26328,6 +26497,10 @@ icon_state = "floorcatwalk" }, /area/custom/syndicate_mothership/elite_squad) +"hhL" = ( +/mob/living/carbon/human, +/turf/unsimulated/desert, +/area/space) "hib" = ( /obj/structure/droppod/Legitimate, /obj/effect/decal/turf_decal/alpha/blue{ @@ -26363,6 +26536,11 @@ "hkh" = ( /turf/unsimulated/floor, /area/velocity/checkpoint) +"hkC" = ( +/turf/unsimulated/floor{ + icon_state = "Heaven_stairs_middle" + }, +/area/space) "hlb" = ( /obj/structure/sign/warning/securearea, /turf/unsimulated/wall/like_a_normal/beige, @@ -26382,6 +26560,11 @@ }, /turf/simulated/shuttle/floor/vox, /area/custom/syndicate_mothership/elite_squad) +"hlR" = ( +/obj/structure/table/rglass, +/obj/item/device/soulstone, +/turf/unsimulated/floor, +/area/space) "hmb" = ( /obj/structure/sign/mark{ icon_state = "b4" @@ -26500,12 +26683,20 @@ }, /turf/environment/space, /area/centcom/evac) +"huV" = ( +/obj/item/weapon/reagent_containers/food/snacks/ectoplasm, +/turf/simulated/floor, +/area/space) "hvb" = ( /obj/structure/object_wall/standart{ icon_state = "wall3" }, /turf/environment/space, /area/shuttle/administration/centcom) +"hvN" = ( +/obj/structure/stool/bed/chair/metal, +/turf/unsimulated/desert, +/area/space) "hwb" = ( /obj/structure/closet/emcloset, /obj/machinery/light{ @@ -26517,6 +26708,10 @@ }, /turf/unsimulated/floor, /area/centcom/evac) +"hwx" = ( +/obj/structure/window/fulltile/reinforced, +/turf/environment/space, +/area/space) "hwF" = ( /turf/unsimulated/floor{ dir = 4; @@ -26529,6 +26724,14 @@ icon_state = "blue" }, /area/centcom/evac) +"hxJ" = ( +/obj/structure/mineral_door/metal, +/obj/structure/mineral_door/silver, +/turf/unsimulated/floor{ + dir = 8; + icon_state = "heaven" + }, +/area/space) "hyb" = ( /turf/unsimulated/floor{ icon_state = "blue" @@ -26620,6 +26823,10 @@ icon_state = "blue" }, /area/centcom/evac) +"hIj" = ( +/obj/item/clothing/shoes/sandal, +/turf/unsimulated/floor, +/area/space) "hJA" = ( /obj/effect/decal/turf_decal{ icon_state = "warn" @@ -26659,6 +26866,11 @@ icon_state = "blue" }, /area/centcom/evac) +"hNZ" = ( +/obj/effect/light_emitter, +/obj/structure/table, +/turf/unsimulated/floor/carpet/blue2, +/area/space) "hOb" = ( /turf/unsimulated/floor{ dir = 1; @@ -26914,6 +27126,12 @@ icon_state = "vaultfull" }, /area/centcom/control) +"inA" = ( +/obj/machinery/vending/chinese{ + use_power = 0 + }, +/turf/unsimulated/floor, +/area/space) "iob" = ( /obj/machinery/light{ dir = 1 @@ -26956,6 +27174,12 @@ icon_state = "floor2" }, /area/centcom/evac) +"isa" = ( +/obj/item/weapon/flora/pottedplant/flower, +/turf/unsimulated/floor{ + icon_state = "heavenfull2" + }, +/area/space) "isb" = ( /obj/effect/decal/turf_decal{ dir = 8; @@ -26977,6 +27201,10 @@ /obj/item/weapon/flora/random, /turf/unsimulated/floor, /area/centcom/specops) +"iuC" = ( +/obj/effect/light_emitter, +/turf/unsimulated/floor/carpet/blue2, +/area/pluvia_heaven) "ivb" = ( /obj/structure/stool/bed/chair/metal/white{ dir = 4 @@ -26999,6 +27227,9 @@ icon_state = "darkgreen" }, /area/centcom/control) +"iwH" = ( +/turf/unsimulated/floor/carpet/blue2, +/area/pluvia_heaven) "ixb" = ( /turf/unsimulated/floor{ dir = 4; @@ -27070,6 +27301,11 @@ icon_state = "dark" }, /area/centcom/control) +"iEU" = ( +/turf/unsimulated/floor{ + icon_state = "heavenfull" + }, +/area/space) "iFb" = ( /obj/machinery/light{ dir = 4 @@ -27271,6 +27507,13 @@ icon_state = "dark" }, /area/centcom/control) +"iYV" = ( +/obj/structure/table/rglass, +/obj/item/weapon/reagent_containers/food/drinks/bottle/ale, +/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, +/obj/item/weapon/reagent_containers/hypospray/autoinjector/space_drugs, +/turf/unsimulated/floor, +/area/space) "jab" = ( /obj/structure/window/thin/reinforced{ dir = 1; @@ -27642,6 +27885,9 @@ /obj/effect/decal/cleanable/dirt, /turf/unsimulated/floor, /area/velocity) +"jGK" = ( +/turf/simulated/floor/beach/water/waterpool/heaven, +/area/space) "jHb" = ( /obj/effect/decal/turf_decal{ dir = 1; @@ -27709,6 +27955,26 @@ icon_state = "green" }, /area/centcom/holding) +"jOn" = ( +/turf/unsimulated/floor{ + icon_state = "heavenfull2" + }, +/area/space) +"jOR" = ( +/obj/structure/rack, +/obj/item/clothing/under/pluvia, +/obj/item/clothing/under/pluvia, +/obj/item/clothing/under/pluvia_gold, +/obj/item/clothing/under/pluvia_gold, +/obj/item/clothing/shoes/white, +/obj/item/clothing/shoes/white, +/obj/item/clothing/shoes/white, +/obj/item/clothing/head/pluvia, +/obj/item/clothing/head/pluvia, +/obj/item/clothing/head/pluvia, +/obj/item/clothing/head/pluvia, +/turf/unsimulated/floor/carpet/blue2, +/area/space) "jPb" = ( /turf/unsimulated/floor{ dir = 5; @@ -27811,6 +28077,12 @@ icon_state = "brown" }, /area/centcom/bar) +"jXP" = ( +/obj/structure/stool/bed/chair/wood/normal{ + dir = 8 + }, +/turf/unsimulated/floor/carpet/blue2, +/area/space) "jYb" = ( /obj/structure/stool/bed/chair/comfy/black, /turf/unsimulated/floor{ @@ -27818,6 +28090,9 @@ icon_state = "brown" }, /area/centcom/bar) +"jYc" = ( +/turf/simulated/floor/carpet/blue2, +/area/space) "jZb" = ( /obj/machinery/light{ dir = 1 @@ -27894,6 +28169,13 @@ icon_state = "grass2" }, /area/centcom/living) +"kdB" = ( +/obj/effect/light_emitter, +/obj/structure/moonwell, +/turf/unsimulated/floor{ + icon_state = "heavenfull" + }, +/area/space) "keb" = ( /obj/structure/window/thin/reinforced{ dir = 4 @@ -27910,6 +28192,16 @@ icon_state = "dark" }, /area/centcom/living) +"keA" = ( +/obj/structure/table/rglass, +/obj/item/weapon/paper, +/obj/item/weapon/paper, +/obj/item/weapon/paper, +/obj/item/weapon/paper, +/obj/item/weapon/paper, +/obj/item/weapon/paper, +/turf/unsimulated/floor, +/area/space) "keZ" = ( /obj/effect/decal/turf_decal{ icon_state = "warn" @@ -27968,6 +28260,10 @@ icon_state = "dark" }, /area/centcom/living) +"kiC" = ( +/obj/item/weapon/noose, +/turf/unsimulated/floor, +/area/space) "kiS" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/effect/decal/turf_decal/wood{ @@ -27993,6 +28289,14 @@ icon_state = "yellow" }, /area/centcom/waitingroom) +"kla" = ( +/obj/structure/rack, +/obj/item/clothing/suit/pluvia_morality, +/obj/item/clothing/suit/pluvia_morality, +/obj/item/clothing/suit/pluvia_morality, +/obj/item/clothing/suit/pluvia_morality, +/turf/unsimulated/floor/carpet/blue2, +/area/space) "klb" = ( /obj/structure/closet/crate{ icon_state = "crateopen"; @@ -28126,6 +28430,9 @@ icon_state = "neutralcorner" }, /area/centcom/bar) +"kzv" = ( +/turf/simulated/wall/heaven, +/area/space) "kAb" = ( /obj/structure/stool/bed/chair/comfy/black{ dir = 1 @@ -28369,6 +28676,14 @@ icon_state = "neutralfull" }, /area/centcom/bar) +"kWT" = ( +/obj/structure/mineral_door/metal, +/obj/structure/mineral_door/silver, +/turf/unsimulated/floor{ + dir = 4; + icon_state = "heaven" + }, +/area/space) "kXb" = ( /turf/unsimulated/floor{ dir = 8; @@ -28624,6 +28939,11 @@ icon_state = "brown" }, /area/centcom/bar) +"lvc" = ( +/obj/structure/rack, +/obj/item/clothing/under/pluvia, +/turf/simulated/floor, +/area/space) "lwb" = ( /obj/machinery/computer/arcade, /obj/machinery/light, @@ -28687,6 +29007,15 @@ icon_state = "brown" }, /area/centcom/bar) +"lEP" = ( +/obj/structure/table/woodentable, +/obj/machinery/chem_dispenser/beer{ + dispensable_reagents = list("singulo","demonsblood","lean","hippiesdelight","devilskiss","kvass","doctorsdelight","atomicbomb","nuka_cola","patron","tonic","beer","kahlua","whiskey","wine","vodka","gin","rum","tequilla","vermouth","cognac","ale","mead","sake"); + name = "heaven booze dispenser"; + pixel_y = 6 + }, +/turf/unsimulated/floor/carpet/blue2, +/area/space) "lFb" = ( /turf/unsimulated/floor{ dir = 9; @@ -28783,6 +29112,11 @@ icon_state = "greencorner" }, /area/centcom/holding) +"lOI" = ( +/obj/item/weapon/throwing_star, +/obj/structure/table/rglass, +/turf/unsimulated/floor, +/area/space) "lPb" = ( /obj/structure/window/thin/reinforced{ dir = 4 @@ -28876,6 +29210,12 @@ }, /turf/unsimulated/floor, /area/centcom/evac) +"lYi" = ( +/turf/simulated/floor/beach/water/waterpool/heaven{ + density = 1; + opacity = 1 + }, +/area/space) "lYM" = ( /obj/effect/decal/turf_decal{ dir = 1; @@ -28925,6 +29265,10 @@ }, /turf/unsimulated/floor, /area/centcom/holding) +"mam" = ( +/obj/structure/stool/bed/chair/comfy/white, +/turf/simulated/floor, +/area/space) "mba" = ( /turf/unsimulated/floor, /area/velocity/exit) @@ -29344,6 +29688,12 @@ icon_state = "white" }, /area/centcom/holding) +"mSS" = ( +/obj/effect/light_emitter, +/turf/unsimulated/floor{ + icon_state = "Heaven_stairs_middle" + }, +/area/space) "mTb" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -29679,6 +30029,12 @@ icon_state = "redyellowfull" }, /area/centcom/tdome/tdomeadmin) +"nAa" = ( +/turf/unsimulated/floor{ + dir = 8; + icon_state = "heaven" + }, +/area/space) "nAb" = ( /obj/structure/disposalpipe/segment, /turf/unsimulated/floor{ @@ -29732,6 +30088,12 @@ icon_state = "redyellowfull" }, /area/centcom/tdome/tdomeadmin) +"nFL" = ( +/obj/structure/stool/bed/chair/wood/normal{ + dir = 4 + }, +/turf/unsimulated/floor/carpet/blue2, +/area/space) "nGb" = ( /obj/structure/table, /obj/item/weapon/storage/toolbox/mechanical, @@ -29907,12 +30269,22 @@ }, /turf/unsimulated/floor/carpet/black, /area/custom/tophat) +"nUI" = ( +/obj/structure/dresser, +/turf/unsimulated/floor/carpet/blue2, +/area/space) "nVb" = ( /turf/unsimulated/floor{ icon_state = "wizlava"; name = "lava" }, /area/custom/wizard_station) +"nVV" = ( +/obj/item/weapon/implanter/loyalty, +/obj/item/weapon/implanter/mindshield, +/obj/structure/table/rglass, +/turf/unsimulated/floor, +/area/space) "nWb" = ( /obj/structure/stool/bar, /turf/unsimulated/floor/carpet/black, @@ -30197,6 +30569,10 @@ }, /turf/environment/space, /area/shuttle/escape/centcom) +"oAU" = ( +/mob/living/carbon/monkey/pluvian, +/turf/simulated/floor, +/area/space) "oAW" = ( /obj/effect/decal/cleanable/cobweb, /turf/unsimulated/floor{ @@ -30348,6 +30724,10 @@ icon_state = "dark" }, /area/centcom/control) +"oSQ" = ( +/obj/effect/light_emitter, +/turf/unsimulated/floor, +/area/space) "oTb" = ( /obj/item/weapon/storage/firstaid/fire{ pixel_x = 2; @@ -30372,6 +30752,12 @@ }, /turf/environment/space, /area/shuttle/escape/centcom) +"oVo" = ( +/turf/unsimulated/floor{ + dir = 4; + icon_state = "heaven" + }, +/area/space) "oWb" = ( /obj/machinery/light{ dir = 8 @@ -30581,6 +30967,15 @@ }, /turf/environment/space, /area/shuttle/escape/centcom) +"pqi" = ( +/obj/structure/table/rglass, +/obj/item/weapon/reagent_containers/food/snacks/chinese/lunarice, +/obj/item/weapon/reagent_containers/food/snacks/chinese/lunarice, +/obj/item/weapon/reagent_containers/food/snacks/chinese/lunarice, +/obj/item/weapon/reagent_containers/food/snacks/chinese/lunarice, +/obj/item/weapon/reagent_containers/food/snacks/chinese/lunarice, +/turf/unsimulated/floor, +/area/space) "prb" = ( /obj/structure/object_wall/evac{ icon_state = "6,23"; @@ -30595,6 +30990,11 @@ }, /turf/environment/space, /area/shuttle/escape/centcom) +"psd" = ( +/obj/effect/light_emitter, +/obj/effect/landmark/latejoin, +/turf/unsimulated/floor, +/area/space) "ptb" = ( /obj/structure/object_wall/evac{ icon_state = "8,23"; @@ -30623,6 +31023,12 @@ }, /turf/environment/space, /area/shuttle/escape/centcom) +"pxq" = ( +/turf/unsimulated/floor{ + dir = 4; + icon_state = "Heaven_stairs_middle" + }, +/area/space) "pya" = ( /obj/effect/decal/turf_decal/orange{ dir = 8; @@ -30636,6 +31042,9 @@ /obj/machinery/computer/crew/erokez, /turf/simulated/shuttle/floor/evac, /area/shuttle/escape/centcom) +"pyr" = ( +/turf/unsimulated/floor/carpet/blue2, +/area/space) "pzb" = ( /obj/structure/object_wall/evac{ icon_state = "11,22"; @@ -30771,6 +31180,19 @@ icon_state = "dark" }, /area/centcom/control) +"pQA" = ( +/obj/structure/table/rglass, +/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla, +/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, +/turf/unsimulated/floor, +/area/space) +"pQZ" = ( +/obj/structure/mineral_door/metal, +/obj/structure/mineral_door/silver, +/turf/unsimulated/floor{ + icon_state = "heavenfull2" + }, +/area/space) "pSb" = ( /obj/structure/object_wall/evac{ icon_state = "15,8" @@ -30939,6 +31361,11 @@ /obj/structure/cult/pylon, /turf/unsimulated/floor/cult, /area/custom/cult) +"qEI" = ( +/obj/item/weapon/kitchenknife/throwing, +/obj/structure/table/rglass, +/turf/unsimulated/floor, +/area/space) "qFs" = ( /obj/machinery/door/airlock/centcom{ dir = 4; @@ -30954,6 +31381,10 @@ icon_state = "dark" }, /area/centcom/specops) +"qJQ" = ( +/obj/effect/light_emitter, +/turf/simulated/floor, +/area/space) "qOG" = ( /obj/effect/decal/cleanable/blood/gibs/core, /turf/unsimulated/floor/cult/lava, @@ -30976,6 +31407,12 @@ icon_state = "dark" }, /area/centcom/control) +"rcP" = ( +/turf/unsimulated/floor{ + dir = 4; + icon_state = "Heaven_Stairs2_wide" + }, +/area/space) "rkK" = ( /obj/item/weapon/flora/pottedplant/tropicalfern{ pixel_y = 5 @@ -30984,6 +31421,24 @@ icon_state = "hydrofloor" }, /area/velocity/locker) +"roT" = ( +/turf/unsimulated/floor{ + dir = 9; + icon_state = "heaven" + }, +/area/space) +"rve" = ( +/turf/simulated/floor{ + icon_state = "Heaven_Stairs_wide" + }, +/area/space) +"rvR" = ( +/obj/effect/light_emitter, +/turf/unsimulated/floor{ + dir = 9; + icon_state = "heaven" + }, +/area/space) "rEu" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/decal/turf_decal/wood{ @@ -31030,6 +31485,10 @@ name = "plating" }, /area/velocity) +"sbs" = ( +/obj/effect/light_emitter, +/turf/unsimulated/floor/carpet/blue2, +/area/space) "scL" = ( /obj/structure/table/woodentable/fancy/black, /obj/item/weapon/kitchenknife/ritual, @@ -31106,6 +31565,14 @@ opacity = 0 }, /area/custom/abductor_ship) +"svp" = ( +/obj/structure/pluvia_gong{ + pixel_x = -15 + }, +/turf/unsimulated/floor{ + icon_state = "heavenfull2" + }, +/area/space) "sAN" = ( /obj/structure/table/woodentable, /obj/item/weapon/storage/box/donkpockets{ @@ -31117,6 +31584,14 @@ icon_state = "floorcatwalk" }, /area/custom/syndicate_mothership/elite_squad) +"sCY" = ( +/obj/machinery/vending/boozeomat{ + name = "Heaven Booze-O-Mat"; + products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/gin=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/rum=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/wine=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/beer=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/ale=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/cream=10,/obj/item/weapon/reagent_containers/food/drinks/cans/tonic=10,/obj/item/weapon/reagent_containers/food/drinks/cans/cola=10,/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater=15,/obj/item/weapon/reagent_containers/food/drinks/flask/barflask=5,/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask=5,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass=50,/obj/item/weapon/reagent_containers/food/drinks/ice=15,/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine=10,/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne=10); + req_access = list() + }, +/turf/unsimulated/floor/carpet/blue2, +/area/space) "sEb" = ( /obj/structure/stool/bed/chair/office/light{ dir = 8 @@ -31186,6 +31661,18 @@ }, /turf/unsimulated/floor, /area/velocity/exit) +"taj" = ( +/turf/simulated/floor/carpet/black, +/area/space) +"tdc" = ( +/obj/structure/table/woodentable, +/obj/machinery/chem_dispenser/soda{ + dispensable_reagents = list("water","ice","coffee","cream","tea","tea","cola","spacemountainwind","dr_gibb","space_up","tonic","sodawater","lemon_lime","sugar","orangejuice","tomatojuice","banana","limejuice","watermelonjuice","berryjuice","grapejuice","lemonjuice","milk","soymilk","nothing"); + name = "heaven soda fountain"; + pixel_y = 6 + }, +/turf/unsimulated/floor/carpet/blue2, +/area/space) "tjK" = ( /obj/structure/table/woodentable, /obj/item/weapon/paper_bin{ @@ -31205,6 +31692,12 @@ icon_state = "dark" }, /area/centcom/living) +"toi" = ( +/obj/structure/table/rglass, +/obj/item/weapon/reagent_containers/food/drinks/bottle/beer, +/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, +/turf/unsimulated/floor, +/area/space) "tqh" = ( /obj/structure/cult/statue/camera/gargoyle, /turf/unsimulated/floor/cult/lava, @@ -31217,6 +31710,33 @@ }, /turf/unsimulated/floor, /area/centcom/tdome) +"tBS" = ( +/obj/structure/rack, +/obj/item/clothing/under/pluvia_gold, +/obj/item/clothing/under/pluvia_gold, +/obj/item/clothing/under/pluvia, +/obj/item/clothing/under/pluvia, +/obj/item/clothing/shoes/white, +/obj/item/clothing/shoes/white, +/obj/item/clothing/shoes/white, +/obj/item/clothing/head/pluvia, +/obj/item/clothing/head/pluvia, +/obj/item/clothing/head/pluvia, +/obj/item/clothing/head/pluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/wpluvia, +/turf/unsimulated/floor/carpet/blue2, +/area/space) "tCc" = ( /obj/structure/mineral_door/cult{ dir = 4 @@ -31251,6 +31771,11 @@ }, /turf/unsimulated/floor/carpet, /area/centcom/living) +"tVp" = ( +/obj/item/weapon/gun/energy/lasercannon, +/obj/structure/table/rglass, +/turf/unsimulated/floor, +/area/space) "tVC" = ( /obj/effect/decal/turf_decal/blue{ dir = 4; @@ -31316,6 +31841,9 @@ icon_state = "redcorner" }, /area/centcom/specops) +"urz" = ( +/turf/unsimulated/floor, +/area/space) "usD" = ( /obj/structure/sign/directions/velocity{ dir = 4; @@ -31342,6 +31870,11 @@ icon_state = "bcircuit" }, /area/custom/syndicate_mothership/control) +"uxA" = ( +/obj/effect/light_emitter, +/obj/item/weapon/occult_pinpointer, +/turf/simulated/floor, +/area/space) "uDv" = ( /obj/structure/sign/poster/contraband/random{ pixel_y = 32 @@ -31387,6 +31920,17 @@ }, /turf/unsimulated/floor, /area/centcom/evac) +"uQY" = ( +/obj/structure/rack, +/obj/item/clothing/suit/pluvia_balance, +/obj/item/clothing/suit/pluvia_balance, +/obj/item/clothing/suit/pluvia_balance, +/obj/item/clothing/suit/pluvia_balance, +/turf/unsimulated/floor/carpet/blue2, +/area/space) +"uRN" = ( +/turf/simulated/floor, +/area/space) "uSt" = ( /obj/machinery/vending/boozeomat{ req_access = list() @@ -31438,6 +31982,14 @@ icon_state = "dark" }, /area/centcom/living) +"veV" = ( +/obj/structure/table/rglass, +/obj/item/weapon/reagent_containers/food/snacks/chinese/lunarice, +/obj/item/weapon/reagent_containers/food/snacks/chinese/lunarice, +/obj/item/weapon/reagent_containers/food/snacks/chinese/lunarice, +/obj/item/weapon/reagent_containers/food/snacks/chinese/lunarice, +/turf/unsimulated/floor, +/area/space) "vir" = ( /obj/structure/closet/wardrobe/grey, /obj/effect/decal/turf_decal/alpha/gray{ @@ -31485,6 +32037,15 @@ icon_state = "hydrofloor" }, /area/velocity/locker) +"vpB" = ( +/obj/structure/table/holotable, +/turf/simulated/floor, +/area/space) +"vxp" = ( +/obj/item/weapon/gun/projectile/revolver/syndie, +/obj/structure/table/rglass, +/turf/unsimulated/floor, +/area/space) "vyU" = ( /obj/structure/table/woodentable, /turf/unsimulated/floor{ @@ -31537,9 +32098,19 @@ /obj/effect/decal/cleanable/blood/gibs/core, /turf/unsimulated/floor/cult, /area/custom/cult) +"vNi" = ( +/obj/item/clothing/shoes/white, +/obj/item/clothing/shoes/white, +/turf/simulated/floor, +/area/space) "vNL" = ( /turf/unsimulated/wall/like_a_normal/beige, /area/velocity/dormitories) +"vOr" = ( +/turf/simulated/floor{ + icon_state = "Heaven_stairs_middle" + }, +/area/space) "vPa" = ( /obj/effect/decal/turf_decal{ dir = 8; @@ -31555,6 +32126,15 @@ icon_state = "browncorner" }, /area/centcom/specops) +"vSg" = ( +/obj/structure/rack, +/obj/item/clothing/suit/pluvia_trick, +/obj/item/clothing/suit/pluvia_trick, +/obj/item/clothing/suit/pluvia_trick, +/obj/item/clothing/suit/pluvia_trick, +/obj/item/clothing/suit/pluvia_trick, +/turf/unsimulated/floor/carpet/blue2, +/area/space) "vSL" = ( /obj/machinery/washing_machine, /obj/machinery/light/small{ @@ -31572,12 +32152,29 @@ "vYm" = ( /turf/environment/space, /area/shuttle/escape_pod6/centcom) +"vZC" = ( +/turf/unsimulated/floor{ + dir = 6; + icon_state = "heaven" + }, +/area/space) +"wdB" = ( +/mob/living/carbon/human/machine, +/turf/unsimulated/desert, +/area/space) "weI" = ( /turf/unsimulated/floor, /area/velocity) "wfy" = ( /turf/unsimulated/floor/cult/lava, /area/custom/cult) +"whN" = ( +/obj/structure/rack, +/obj/item/clothing/suit/pluvia_morality, +/obj/item/clothing/suit/pluvia_morality, +/obj/item/clothing/suit/pluvia_morality, +/turf/simulated/floor, +/area/space) "wlc" = ( /obj/effect/decal/turf_decal{ dir = 9; @@ -31598,6 +32195,10 @@ "wtx" = ( /turf/simulated/wall/cult/runed/anim, /area/custom/cult) +"wvZ" = ( +/obj/item/weapon/defibrillator/loaded, +/turf/unsimulated/floor, +/area/space) "wBQ" = ( /obj/effect/decal/turf_decal/blue{ dir = 1; @@ -31626,6 +32227,11 @@ icon_state = "bluecorner" }, /area/centcom/specops) +"wQk" = ( +/turf/unsimulated/floor{ + icon_state = "Heaven_Stairs_wide" + }, +/area/space) "wRg" = ( /turf/unsimulated/wall/like_a_normal/beige, /area/velocity/waitingroom) @@ -31657,6 +32263,12 @@ icon_state = "floorcatwalk" }, /area/custom/syndicate_mothership/elite_squad) +"wWE" = ( +/turf/unsimulated/floor{ + dir = 10; + icon_state = "heaven" + }, +/area/space) "xdd" = ( /obj/machinery/light{ dir = 4 @@ -31665,6 +32277,16 @@ name = "plating" }, /area/velocity) +"xfy" = ( +/turf/simulated/floor/carpet/orange, +/area/space) +"xnw" = ( +/obj/structure/table/rglass, +/obj/item/weapon/reagent_containers/food/drinks/bottle/rum, +/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, +/obj/item/weapon/reagent_containers/hypospray/autoinjector/space_drugs, +/turf/unsimulated/floor, +/area/space) "xrP" = ( /turf/simulated/shuttle/floor/vox{ icon_state = "floorcatwalk" @@ -31675,6 +32297,13 @@ icon_state = "floorcatwalk" }, /area/custom/syndicate_mothership/elite_squad) +"xuo" = ( +/obj/structure/rack, +/obj/item/clothing/suit/pluvia_balance, +/obj/item/clothing/suit/pluvia_balance, +/obj/item/clothing/suit/pluvia_balance, +/turf/simulated/floor, +/area/space) "xzy" = ( /obj/structure/object_wall/standart{ icon_state = "wall3" @@ -31737,6 +32366,12 @@ }, /turf/unsimulated/floor, /area/centcom/tdome) +"xSf" = ( +/obj/item/weapon/flora/pottedplant/orientaltree, +/turf/unsimulated/floor{ + icon_state = "heaven" + }, +/area/space) "xTK" = ( /obj/machinery/conveyor{ id = "QMLoad" @@ -31763,6 +32398,11 @@ /obj/structure/cult/statue/camera, /turf/unsimulated/floor/cult/lava, /area/custom/cult) +"ybn" = ( +/obj/structure/rack, +/obj/item/clothing/under/pluvia_gold, +/turf/simulated/floor, +/area/space) "ycG" = ( /obj/machinery/door/airlock/centcom{ name = "Restroom"; @@ -31978,20 +32618,20 @@ aaM aaM aaM aaM +aeD +aeD +aeD +aeD +aeD +aeD +aeD +aeD aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aeD +aeD +aeD aaM aaM aaM @@ -32235,20 +32875,20 @@ aaM aaM aaM aaM +aeD +urz +urz +urz +toi +iYV +xnw +aeD aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aeD +oAU +aeD aaM aaM aaM @@ -32492,30 +33132,30 @@ aaM aaM aaM aaM +aeD +urz +eek +urz +urz +urz +pQA +aeD +aeD +aeD aaM +aeD +hwx +aeD aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aeD +aeD +aeD +aeD +aeD +aeD +aeD aaM aaM aaM @@ -32749,30 +33389,30 @@ aaM aaM aaM aaM +aeD +urz +hvN +kiC +urz +urz +eLJ +aeD +bsF +aeD +aeD +aAU +cdG +fnH +aeD aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aeD +byR +uRN +uRN +uRN +byR +aeD aaM aaM aaM @@ -33006,30 +33646,30 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aeD +taj +hIj +urz +pqi +urz +nVV +aeD +uRN +aeD +inA +urz +urz +urz +keA +aeD +aeD +aeD +uRN +vpB +grc +mam +uRN +aeD aaM aaM aaM @@ -33263,30 +33903,30 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aeD +jYc +hIj +oSQ +bsz +urz +urz +urz +urz +urz +urz +urz +psd +urz +urz +urz +urz +urz +uRN +uRN +uxA +uRN +uRN +aeD aaM aaM aaM @@ -33520,30 +34160,30 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aeD +xfy +hIj +urz +veV +urz +hlR +aeD +aeD +aeD +urz +urz +urz +urz +biw +aeD +aeD +aeD +uRN +aVL +huV +csx +uRN +aeD aaM aaM aaM @@ -33777,10 +34417,30 @@ aaM aaM aaM aaM +aeD +urz +wdB +urz +urz +urz +tVp +aeD aaM aaM +aeD +urz +urz +wvZ +aeD aaM aaM +aeD +byR +uRN +uRN +uRN +byR +aeD aaM aaM aaM @@ -33798,35 +34458,15 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -nIb -aAO -nNb -nYb -nWb -nNb -aBq -abe -nIb +nIb +aAO +nNb +nYb +nWb +nNb +aBq +abe +nIb aaM aeD abi @@ -34034,30 +34674,30 @@ aaM aaM aaM aaM +aeD +urz +hhL +urz +urz +urz +qEI +aeD aaM aaM aaM +hwx +uRN +hwx aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aeD +aeD +aeD +aeD +aeD +aeD +aeD aaM aaM aaM @@ -34291,22 +34931,22 @@ aaM aaM aaM aaM +aeD +urz +urz +urz +vxp +fZj +lOI +aeD aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aeD +aeD +aeD +uRN +aeD +aeD +aeD aaM aaM aaM @@ -34548,22 +35188,22 @@ aaM aaM aaM aaM +aeD +aeD +aeD +aeD +aeD +aeD +aeD +aeD aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aeD +ybn +vNi +uRN +uRN +fRY +aeD aaM aaM aaM @@ -34814,13 +35454,13 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aeD +lvc +vNi +uRN +uRN +fcN +aeD aaM aaM aaM @@ -35071,13 +35711,13 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aeD +uRN +uRN +qJQ +uRN +whN +aeD aaM aaM aaM @@ -35328,13 +35968,13 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aeD +lvc +vNi +uRN +uRN +xuo +aeD aaM aaM aaM @@ -35585,13 +36225,13 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aeD +ybn +vNi +dNj +uRN +dWI +aeD aaM aaM aaM @@ -35842,13 +36482,13 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aeD +aeD +aeD +aeD +aeD +aeD +aeD aaM aaM aaM @@ -36096,39 +36736,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi aaM aaM aaM @@ -36353,39 +36993,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -36610,39 +37250,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +jGK +jGK +jGK +fEa +oVo +pyr +jOn +fEa +oVo +vZC +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -36867,39 +37507,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jOn +svp +pyr +bsA +jOn +isa +jOn +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -37124,39 +37764,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +jGK +jGK +jGK +roT +nAa +pyr +jOn +roT +nAa +wWE +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -37381,39 +38021,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +jGK +jGK +kzv +kzv +kzv +pyr +jOn +cOi +kzv +kzv +nAa +wWE +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -37638,39 +38278,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +jGK +jGK +jOn +fEa +oVo +pyr +jOn +fEa +wQk +iEU +iEU +gKi +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -37895,39 +38535,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +jGK +jGK +jOn +svp +jOn +sbs +bdA +jOn +hkC +iEU +kdB +gKi +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -38152,39 +38792,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +jGK +jGK +jOn +roT +nAa +pyr +jOn +roT +aTH +iEU +iEU +gKi +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -38409,39 +39049,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +jGK +jGK +kzv +kzv +kzv +pyr +jOn +cOi +kzv +kzv +kzv +kzv +kzv +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -38666,39 +39306,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +jGK +jGK +jGK +fEa +oVo +pyr +jOn +fEa +kzv +cHz +faF +fEa +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -38923,39 +39563,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jOn +svp +pyr +bsA +jOn +kzv +hNZ +faF +jOn +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -39180,39 +39820,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +jGK +jGK +jGK +roT +nAa +pyr +jOn +roT +kzv +cHz +faF +roT +jGK +jGK +jGK +jGK +jGK +kzv +kzv +kzv +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -39437,39 +40077,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +kzv +jGK +jGK +jGK +kzv +rcP +pxq +gjJ +kzv +xSf +jOn +cOi +kzv +jGK +jGK +jGK +kzv +tBS +nUI +jOR +kzv +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -39694,39 +40334,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +sCY +vZC +jOn +fEa +oVo +vZC +jOn +fEa +oVo +vZC +jOn +fEa +wQk +vZC +jOn +fEa +pyr +iwH +iwH +iwH +kWT +wQk +wQk +wQk +wQk +wQk +rve +lYi aaM aaM aaM @@ -39951,39 +40591,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +tdc +jOn +jOn +jOn +jOn +bsA +jOn +jOn +jOn +jOn +jOn +jOn +mSS +jOn +jOn +jOn +pyr +iwH +iuC +iwH +pQZ +hkC +mSS +hkC +hkC +hkC +vOr +lYi aaM aaM aaM @@ -40208,39 +40848,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +lEP +wWE +jOn +nFL +nFL +nFL +jOn +roT +nAa +wWE +jOn +roT +aTH +wWE +jOn +roT +pyr +iwH +iwH +iwH +hxJ +aTH +aTH +aTH +aTH +aTH +bnM +lYi aaM aaM aaM @@ -40465,39 +41105,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +kzv +gKi +pyr +cHz +cHz +cHz +pyr +cOi +cGh +gKi +jOn +cOi +kzv +jGK +jGK +jGK +kzv +kla +uQY +vSg +kzv +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -40722,39 +41362,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +kzv +vZC +jOn +jXP +jXP +jXP +jOn +fEa +oVo +vZC +jOn +fEa +jGK +jGK +jGK +jGK +jGK +kzv +kzv +kzv +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -40979,39 +41619,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +kzv +jOn +jOn +jOn +jOn +jOn +jOn +jOn +jOn +jOn +jOn +jOn +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -41236,39 +41876,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +kzv +cTv +jOn +roT +nAa +wWE +jOn +roT +nAa +wWE +jOn +rvR +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -41493,39 +42133,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +kzv +kzv +kzv +kzv +kzv +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -41750,39 +42390,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -42007,39 +42647,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +jGK +lYi aaM aaM aaM @@ -42264,39 +42904,39 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi +lYi aaM aaM aaM diff --git a/taucetistation.dme b/taucetistation.dme index e3766ada9b0..020fd77d2dc 100644 --- a/taucetistation.dme +++ b/taucetistation.dme @@ -1924,6 +1924,7 @@ #include "code\modules\mob\living\carbon\human\inventory.dm" #include "code\modules\mob\living\carbon\human\life.dm" #include "code\modules\mob\living\carbon\human\login.dm" +#include "code\modules\mob\living\carbon\human\pluvia_heaven.dm" #include "code\modules\mob\living\carbon\human\races_abilities.dm" #include "code\modules\mob\living\carbon\human\say.dm" #include "code\modules\mob\living\carbon\human\update_icons.dm" @@ -2293,6 +2294,7 @@ #include "code\modules\religion\altar_types\cult\altar_of_gods.dm" #include "code\modules\religion\religion_types\chaplain.dm" #include "code\modules\religion\religion_types\cult.dm" +#include "code\modules\religion\religion_types\pluvia.dm" #include "code\modules\religion\rites\instant\death_alarm.dm" #include "code\modules\religion\rites\instant\instant.dm" #include "code\modules\religion\rites\instant\spawn_item.dm"