Skip to content

Commit

Permalink
[MDB Ignore] Adds Pagers and Guest Passes (#531)
Browse files Browse the repository at this point in the history
  • Loading branch information
MrMelbert authored Aug 10, 2024
1 parent ec99927 commit e056293
Show file tree
Hide file tree
Showing 9 changed files with 1,309 additions and 199 deletions.
281 changes: 177 additions & 104 deletions _maps/map_files/KiloStation/KiloStation.dmm

Large diffs are not rendered by default.

292 changes: 204 additions & 88 deletions _maps/map_files/LimaStation/LimaStation.dmm

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion code/modules/jobs/job_types/janitor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,12 @@
if(check_holidays(GARBAGEDAY))
backpack_contents += list(/obj/item/gun/ballistic/revolver)
r_pocket = /obj/item/ammo_box/a357

/*
var/static/access_key_given = FALSE
if(!access_key_given && !visuals_only)
access_key_given = TRUE
backpack_contents += list(/obj/item/access_key)
*/

/datum/outfit/job/janitor/get_types_to_preload()
. = ..()
Expand Down
24 changes: 18 additions & 6 deletions code/modules/paperwork/desk_bell.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
var/ring_cooldown_length = 0.3 SECONDS // This is here to protect against tinnitus.
/// The sound the bell makes
var/ring_sound = 'sound/machines/microwave/microwave-end.ogg'
/// Whether we can be deconstructed
var/can_deconstruct = TRUE
/// Whether we can be tied to a chair
var/can_tie_to_chair = TRUE

/obj/structure/desk_bell/Initialize(mapload)
. = ..()
Expand All @@ -27,7 +31,7 @@
/obj/structure/desk_bell/add_context(atom/source, list/context, obj/item/held_item, mob/user)
. = ..()

if(held_item?.tool_behaviour == TOOL_WRENCH)
if(can_deconstruct && held_item?.tool_behaviour == TOOL_WRENCH)
context[SCREENTIP_CONTEXT_RMB] = "Disassemble"
return CONTEXTUAL_SCREENTIP_SET

Expand Down Expand Up @@ -73,17 +77,23 @@
return FALSE
return ..()

/obj/structure/desk_bell/deconstruct(disassembled)
if(disassembled)
if(!broken_ringer) // Drop 2 if it's not broken.
new/obj/item/stack/sheet/iron(drop_location())
new/obj/item/stack/sheet/iron(drop_location())
return ..()

// Deconstruct
/obj/structure/desk_bell/wrench_act_secondary(mob/living/user, obj/item/tool)
if(!can_deconstruct)
return ..()
balloon_alert(user, "taking apart...")
tool.play_tool_sound(src)
if(tool.use_tool(src, user, 5 SECONDS))
balloon_alert(user, "disassembled")
playsound(user, 'sound/items/deconstruct.ogg', 50, vary = TRUE)
if(!broken_ringer) // Drop 2 if it's not broken.
new/obj/item/stack/sheet/iron(drop_location())
new/obj/item/stack/sheet/iron(drop_location())
qdel(src)
deconstruct(TRUE)
return ITEM_INTERACT_SUCCESS
return ..()

Expand Down Expand Up @@ -111,6 +121,9 @@
ring_cooldown_length = 0

/obj/structure/desk_bell/MouseDrop(obj/over_object, src_location, over_location)
. = ..()
if(!can_tie_to_chair || !isliving(usr) || usr.incapacitated())
return
if(!istype(over_object, /obj/vehicle/ridden/wheelchair))
return
if(!Adjacent(over_object) || !Adjacent(usr))
Expand All @@ -123,4 +136,3 @@
if(!do_after(usr, 0.5 SECONDS))
return
target.attach_bell(src)
return ..()
2 changes: 2 additions & 0 deletions maplestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6136,6 +6136,8 @@
#include "maplestation_modules\code\datums\votes\transfer_vote.dm"
#include "maplestation_modules\code\game\area\space_station_13_areas.dm"
#include "maplestation_modules\code\game\machinery\fax_machine.dm"
#include "maplestation_modules\code\game\machinery\guess_pass.dm"
#include "maplestation_modules\code\game\machinery\pager.dm"
#include "maplestation_modules\code\game\machinery\towel_rack.dm"
#include "maplestation_modules\code\game\objects\unique_examine_items.dm"
#include "maplestation_modules\code\game\objects\effects\landmarks.dm"
Expand Down
Loading

0 comments on commit e056293

Please sign in to comment.