Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new jungle ruin: "Vampire Laboratory" #1314

Merged
merged 6 commits into from
Jan 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,110 changes: 3,110 additions & 0 deletions _maps/_mod_celadon/RandomRuins/JungleRuins/jungle_vamplab.dmm

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions code/game/objects/structures/safe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ FLOOR SAFES
. = ..()

// Combination generation
for(var/i in 1 to number_of_tumblers)
tumblers.Add(rand(0, 99))
if(tumblers.len < 1) // [CELADON-ADD] - Добавляем проверку наличия кодов, для возможности использования определённых кодов.
for(var/i in 1 to number_of_tumblers)
tumblers.Add(rand(0, 99))

if(!mapload)
return
Expand Down
Binary file not shown.
Binary file not shown.
Binary file added mod_celadon/_storge_icons/icons/mobs/Miko.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions mod_celadon/items/_items.dme
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "code/head.dm"
#include "code/items.dm"
#include "code/languages.dm"
#include "code/musicbox.dm"
#include "code/plushes.dm"
#include "code/pocketwatch.dm"
#include "code/rings.dm"
Expand Down
40 changes: 40 additions & 0 deletions mod_celadon/items/code/musicbox.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/obj/item/toy/musicbox
name = "Музыкальная шкатулка"
desc = "Надпись на дне: <i>Прекрасной вампирочке от её рычалки. С любовью на долгую память.</i>"
icon = 'mod_celadon/_storge_icons/icons/obj/musicbox.dmi'
icon_state = "box_close"
lefthand_file = 'mod_celadon/_storge_icons/icons/mob/hands/musicbox_hands_left.dmi'
righthand_file = 'mod_celadon/_storge_icons/icons/mob/hands/musicbox_hands_right.dmi'
usesound = 'mod_celadon/_storge_sounds/sound/items/musicbox.ogg'

COOLDOWN_DECLARE(musicbox_cooldown)

/obj/item/toy/musicbox/Initialize()
. = ..()

/obj/item/toy/musicbox/attack_self(mob/user)
. = ..()
if((!COOLDOWN_FINISHED(src, musicbox_cooldown)))
return
COOLDOWN_START(src, musicbox_cooldown, 38 SECONDS)
// Вероятно дальше есть способ делать это более правильно и более оптимизировано, но кто нас остановит?
addtimer(CALLBACK(src, .proc/start_playing), 5 SECONDS)
to_chat(user, "<span class='notice'>Вы проворачиваете ключик, что приводит шкатулку в действие.</span>")
playsound(src.loc, usesound, 50, TRUE)
addtimer(CALLBACK(src, .proc/finish_playing), 38 SECONDS)

/obj/item/toy/musicbox/proc/start_playing()
icon_state = "box_open"

/obj/item/toy/musicbox/proc/finish_playing()
icon_state = "box_static"

/obj/item/toy/musicbox/AltClick(mob/living/carbon/user, obj/item/I)
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
return
if(COOLDOWN_TIMELEFT(src, musicbox_cooldown) > 0)
return
if(icon_state == "box_close")
icon_state = "box_static"
else
icon_state = "box_close"
8 changes: 8 additions & 0 deletions mod_celadon/maps/code/ruins/ruin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,14 @@
description = "A group of pirates on a small ship in the jungle."
suffix = "jungle_pirate.dmm"

/datum/map_template/ruin/jungle/vamplab
name = "Vampire laboratory"
id = "vamp-lab"
description = "A Laboratory for the development of the drug 'Vita-Null+X', which will help cure vampirism, or not.."
suffix = "jungle_vamplab.dmm"
allow_duplicates = FALSE
cost = 10

// ///
// Lavaland ruin ///
// ///
Expand Down
1 change: 1 addition & 0 deletions mod_celadon/structures/_structures.dme
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@
#include "code/obj/gun.dm"
#include "code/obj/spawners.dm"
#include "code/obj/table.dm"
#include "code/obj/safe.dm"

#endif
12 changes: 12 additions & 0 deletions mod_celadon/structures/code/obj/safe.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/obj/item/storage/secure/safe/lab
name = "Secure safe"
desc = "Внизу видна нашкрябанная надпись: <i>Не совершай ошибок.</i>"

/obj/item/storage/secure/safe/lab/Initialize()
. = ..()
new /obj/item/radio/old(src)
new /obj/item/pizzabox/bomb{bomb_defused = 0;bomb_timer = 3}(src)
new /obj/item/spacecash/bundle/c1000(src)
new /obj/item/clothing/accessory/medal/gold{desc = "За успешный эксперимент в 2570г."}(src)
SEND_SIGNAL(src, COMSIG_TRY_STORAGE_SET_LOCKSTATE, TRUE)
SEND_SIGNAL(src, COMSIG_TRY_STORAGE_HIDE_FROM, usr)
Loading