Skip to content
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
19 changes: 19 additions & 0 deletions modular_meta/features/jukeboxes_to_bartender/code/beacon.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/obj/item/choice_beacon/jukebox
name = "Jukebox delivery beacon"
desc = "Is it party time already?"
/obj/item/choice_beacon/jukebox/examine()
. = ..()
.+= span_warning("Chosen item will be bolted with floor upon an arrival. Please, be careful \
with your pleased location")

/obj/item/choice_beacon/jukebox/generate_display_names()
. = ..()
var/static/list/jukebox_items
if(!jukebox_items)
jukebox_items = list()
var/list/possible_jukebox_items = list(
/obj/machinery/jukebox
)
for(var/obj/item/jukebox_item as anything in possible_jukebox_items)
jukebox_items[initial(jukebox_item.name)] = jukebox_item
return jukebox_items
5 changes: 5 additions & 0 deletions modular_meta/features/jukeboxes_to_bartender/code/loadout.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/datum/outfit/job/bartender
backpack_contents = list(
/obj/item/storage/box/beanbag = 1,
/obj/item/choice_beacon/jukebox
)
9 changes: 9 additions & 0 deletions modular_meta/features/jukeboxes_to_bartender/includes.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#include "code\loadout.dm"
#include "code\beacon.dm"

/datum/modpack/jukebox
id = "jukebox"
name = "jukebox beacon"
group = "Features"
desc = "Добавляет маяк отправляющий капсулу с джукбоксом "
author = "Bruh24"
10 changes: 5 additions & 5 deletions modular_meta/features/novichok/code/bottle.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/obj/item/reagent_containers/cup/bottle/novichok
name = "novichok bottle"
desc = "A bottle full of an odd liquid, that seemingly has no color, as well as any sort of distinctive smell"
list_reagents = list(/datum/reagent/toxin/novichok = 30)
/obj/item/reagent_containers/cup/bottle/novichok
name = "novichok bottle"
desc = "A bottle full of an odd liquid, that seemingly has no color, as well as any sort of distinctive smell"
list_reagents = list(/datum/reagent/toxin/novichok = 30)

78 changes: 39 additions & 39 deletions modular_meta/features/novichok/code/novichok_reagent.dm
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
/datum/reagent/toxin/novichok
name = "Novichok"
description = "A lethal nerve agent."
color = "#AAAAAA77"
toxpwr = 2
metabolization_rate = 0.7 * REAGENTS_METABOLISM
/datum/reagent/toxin/novichok/proc/pick_paralyzed_limb()
return pick(TRAIT_PARALYSIS_L_ARM, TRAIT_PARALYSIS_R_ARM, TRAIT_PARALYSIS_R_LEG, TRAIT_PARALYSIS_L_LEG)
/datum/reagent/toxin/novichok/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired)
. = ..()
var/need_update
if(times_fired % 3 == 0)
need_update += M.adjustOxyLoss(12, updating_health = TRUE)
need_update += M.adjustOrganLoss(ORGAN_SLOT_HEART, 3 * REM * seconds_per_tick)
need_update += M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3 * REM * seconds_per_tick)
if(times_fired % 30 == 0 && times_fired > 0)
if(ishuman(M) && !M.undergoing_cardiac_arrest() && M.can_heartattack())
M.set_heartattack(TRUE)
if(M.stat == CONSCIOUS)
M.visible_message(span_userdanger("[M] clutches at [M.p_their()] chest as if [M.p_their()] heart stopped!"))
if(SPT_PROB(10, seconds_per_tick))
var/paralyzed_limb = pick_paralyzed_limb()
ADD_TRAIT(M, paralyzed_limb, type)
need_update += M.adjustStaminaLoss(10 * REM * seconds_per_tick, updating_stamina = FALSE)
if(need_update)
return UPDATE_MOB_HEALTH
/datum/reagent/toxin/novichok/on_mob_end_metabolize(mob/living/carbon/M)
. = ..()
if(!ishuman(M))
return
REMOVE_TRAIT(M, TRAIT_PARALYSIS_L_ARM, type)
REMOVE_TRAIT(M, TRAIT_PARALYSIS_R_ARM, type)
REMOVE_TRAIT(M, TRAIT_PARALYSIS_L_LEG, type)
REMOVE_TRAIT(M, TRAIT_PARALYSIS_R_LEG, type)
/datum/reagent/toxin/novichok
name = "Novichok"
description = "A lethal nerve agent."
color = "#AAAAAA77"
toxpwr = 2
metabolization_rate = 0.7 * REAGENTS_METABOLISM

/datum/reagent/toxin/novichok/proc/pick_paralyzed_limb()
return pick(TRAIT_PARALYSIS_L_ARM, TRAIT_PARALYSIS_R_ARM, TRAIT_PARALYSIS_R_LEG, TRAIT_PARALYSIS_L_LEG)

/datum/reagent/toxin/novichok/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired)
. = ..()
var/need_update
if(times_fired % 3 == 0)
need_update += M.adjustOxyLoss(12, updating_health = TRUE)
need_update += M.adjustOrganLoss(ORGAN_SLOT_HEART, 3 * REM * seconds_per_tick)
need_update += M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3 * REM * seconds_per_tick)
if(times_fired % 30 == 0 && times_fired > 0)
if(ishuman(M) && !M.undergoing_cardiac_arrest() && M.can_heartattack())
M.set_heartattack(TRUE)
if(M.stat == CONSCIOUS)
M.visible_message(span_userdanger("[M] clutches at [M.p_their()] chest as if [M.p_their()] heart stopped!"))
if(SPT_PROB(10, seconds_per_tick))
var/paralyzed_limb = pick_paralyzed_limb()
ADD_TRAIT(M, paralyzed_limb, type)
need_update += M.adjustStaminaLoss(10 * REM * seconds_per_tick, updating_stamina = FALSE)
if(need_update)
return UPDATE_MOB_HEALTH

/datum/reagent/toxin/novichok/on_mob_end_metabolize(mob/living/carbon/M)
. = ..()
if(!ishuman(M))
return
REMOVE_TRAIT(M, TRAIT_PARALYSIS_L_ARM, type)
REMOVE_TRAIT(M, TRAIT_PARALYSIS_R_ARM, type)
REMOVE_TRAIT(M, TRAIT_PARALYSIS_L_LEG, type)

REMOVE_TRAIT(M, TRAIT_PARALYSIS_R_LEG, type)

10 changes: 5 additions & 5 deletions modular_meta/features/novichok/code/poison_kit.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/obj/item/storage/box/syndie_kit/chemical/PopulateContents()
.=..()
new /obj/item/reagent_containers/cup/bottle/novichok(src)

/obj/item/storage/box/syndie_kit/chemical/PopulateContents()
.=..()
new /obj/item/reagent_containers/cup/bottle/novichok(src)

22 changes: 11 additions & 11 deletions modular_meta/features/novichok/includes.dm
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#include "code\novichok_reagent.dm"
#include "code\poison_kit.dm"
#include "code\bottle.dm"
/datum/modpack/novichok
id = "novichok"
name = "Новичок"
group = "Features"
desc = "Добавляет яд из СССР"
author = "DarkPush"
#include "code\novichok_reagent.dm"
#include "code\poison_kit.dm"
#include "code\bottle.dm"

/datum/modpack/novichok
id = "novichok"
name = "Новичок"
group = "Features"
desc = "Добавляет яд из СССР"
author = "DarkPush"

1 change: 1 addition & 0 deletions modular_meta/main_modular_include.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include "features\deathmatch\includes.dm"
#include "features\countdown_antimov_sfx\includes.dm"
#include "features\novichok\includes.dm"
#include "features\jukeboxes_to_bartender\includes.dm"

/* --- Reverts --- */

Expand Down
Loading