Skip to content

Commit

Permalink
Barricades (#8468)
Browse files Browse the repository at this point in the history
* draft of barricades

* barrier_remote_control

* playtesting_fixes

* apply_review_feedback

* disable ballistic barriers and revert map changes
  • Loading branch information
SirRichardFrancis committed May 17, 2024
1 parent 6e47144 commit d44357f
Show file tree
Hide file tree
Showing 9 changed files with 482 additions and 18 deletions.
1 change: 1 addition & 0 deletions cev_eris.dme
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,7 @@
#include "code\game\machinery\telecomms\presets.dm"
#include "code\game\machinery\telecomms\telecomunications.dm"
#include "code\game\machinery\telecomms\telemonitor.dm"
#include "code\game\objects\barricades.dm"
#include "code\game\objects\buckling.dm"
#include "code\game\objects\empulse.dm"
#include "code\game\objects\explosion.dm"
Expand Down
6 changes: 5 additions & 1 deletion code/__HELPERS/global_lists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ GLOBAL_LIST_EMPTY(mechas_list) //list of all mechs. Used by hostile mobs targ
GLOBAL_LIST_EMPTY(all_burrows) //list of all burrows
GLOBAL_LIST_EMPTY(all_maintshrooms) //list of all maintshrooms

// Associated list where key is shared between /obj/structure/barrier/four_way and /obj/item/device/assembly/signaler, linking them together
// Value is a list of 'code' and 'frequency' variables which are assigned to both linked objects on Initialize()
GLOBAL_LIST_EMPTY(roundstart_barrier_groups)

//Machinery lists
GLOBAL_LIST_EMPTY(alarm_list) //List of fire alarms
GLOBAL_LIST_EMPTY(ai_status_display_list) //List of AI status displays
Expand Down Expand Up @@ -143,7 +147,7 @@ var/global/list/organ_tag_to_name = list(
groin = "groin",l_leg = "left leg",
chest2= "back", heart = "heart",
lungs = "lungs", liver = "liver",
"left kidney" = "left kidney",
"left kidney" = "left kidney",
"right kidney" = "right kidney",
stomach = "stomach", brain = "brain"
)
Expand Down
50 changes: 50 additions & 0 deletions code/datums/craft/recipes/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,56 @@
)
related_stats = list(STAT_MEC)

/datum/craft_recipe/bollards
name = "bollards"
result = /obj/structure/barrier
time = WORKTIME_NORMAL
steps = list(
list(CRAFT_MATERIAL, 10, MATERIAL_STEEL)
)
flags = CRAFT_ON_FLOOR|CRAFT_ONE_PER_TURF
related_stats = list(STAT_MEC)

/datum/craft_recipe/four_way
name = "4-way barrier"
result = /obj/structure/barrier/four_way
time = WORKTIME_NORMAL
steps = list(
list(CRAFT_MATERIAL, 15, MATERIAL_PLASTEEL)
)
flags = CRAFT_ON_FLOOR|CRAFT_ONE_PER_TURF
related_stats = list(STAT_MEC)

/datum/craft_recipe/hedgehog
name = "hedgehog barrier"
result = /obj/structure/barrier/hedgehog
time = WORKTIME_NORMAL
steps = list(
list(CRAFT_MATERIAL, 15, MATERIAL_STEEL)
)
flags = CRAFT_ON_FLOOR|CRAFT_ONE_PER_TURF
related_stats = list(STAT_MEC)

/datum/craft_recipe/barbed_wire
name = "barbed wire"
result = /obj/structure/barrier/barbed_wire
time = WORKTIME_NORMAL
steps = list(
list(CRAFT_MATERIAL, 5, MATERIAL_STEEL)
)
flags = CRAFT_ON_FLOOR|CRAFT_ONE_PER_TURF
related_stats = list(STAT_MEC)
/*
/datum/craft_recipe/ballistic_barrier
name = "ballistic barrier"
result = /obj/structure/barrier/ballistic
time = WORKTIME_NORMAL
steps = list(
list(CRAFT_MATERIAL, 20, MATERIAL_PLASTEEL)
)
flags = CRAFT_ON_FLOOR|CRAFT_ONE_PER_TURF
related_stats = list(STAT_MEC)
*/ // TODO --KIROV
/datum/craft_recipe/kitchen_spike
name = "Meat spike"
result = /obj/structure/kitchenspike
Expand Down
Loading

0 comments on commit d44357f

Please sign in to comment.