Skip to content

Commit

Permalink
Merge branch 'master' into Burrowing-heaven
Browse files Browse the repository at this point in the history
  • Loading branch information
Kitsunemitsu authored Jul 25, 2023
2 parents 17b48d4 + dccdb10 commit 70cba0a
Show file tree
Hide file tree
Showing 100 changed files with 1,100 additions and 113 deletions.
Binary file modified ModularTegustation/Teguicons/64x64.dmi
Binary file not shown.
Binary file modified ModularTegustation/Teguicons/96x64.dmi
Binary file not shown.
Binary file modified ModularTegustation/Teguicons/tegu_effects.dmi
Binary file not shown.
Binary file modified ModularTegustation/Teguicons/tegumobs.dmi
Binary file not shown.
33 changes: 33 additions & 0 deletions ModularTegustation/tegu_items/gadgets/unpowered.dm
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,36 @@
to_chat(user, "<span class='notice'>You inject the syringe and instantly feel better.</span>")
user.adjustBruteLoss(-40)
qdel(src)

//General Invitation
/obj/item/invitation //intended for ordeals
name = "General Invitation"
desc = "A mysterious invitation to a certain library. Using this on an abnormality seems to teleport them away when they die, leaving an incomplete book on the spot."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "invitation"

/obj/item/invitation/attack(mob/living/M, mob/user)
if(isabnormalitymob(M) && !(M.status_flags & GODMODE) && !(M.has_status_effect(/datum/status_effect/invitation)))
to_chat(user, "<span class='nicegreen'>You blow the [src].</span>")
M.visible_message("<span class='notice'>[user] sticks a general invitation on [M]!</span>")
M.apply_status_effect(/datum/status_effect/invitation)
playsound(get_turf(M), 'sound/abnormalities/book/scribble.ogg', 50, TRUE)
qdel(src)
else
M.visible_message("<span class='warning'>[M] refuses to sign the general invitation!</span>")

/datum/status_effect/invitation
id = "general invitation"
status_type = STATUS_EFFECT_UNIQUE
duration = -1
alert_type = null

/datum/status_effect/invitation/on_apply()
. = ..()
RegisterSignal(owner, COMSIG_LIVING_DEATH, .proc/invite)

/datum/status_effect/invitation/proc/invite()
SIGNAL_HANDLER
UnregisterSignal(owner, COMSIG_LIVING_DEATH)
var/mob/living/O = owner
O.turn_book()
7 changes: 3 additions & 4 deletions _maps/map_files/Lambda/lambdacorp.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9997,9 +9997,6 @@
/turf/open/floor/plasteel/sepia,
/area/department_main/information)
"KK" = (
/obj/item/records/timestop,
/obj/item/records/information,
/obj/item/records/abnodelay,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
Expand Down Expand Up @@ -12659,7 +12656,9 @@
dir = 8
},
/obj/effect/turf_decal/tile/neutral,
/obj/structure/closet/secure_closet/record,
/obj/structure/closet{
icon_state = "records"
},
/obj/structure/disposalpipe/segment{
color = "#0000ff"
},
Expand Down
Loading

0 comments on commit 70cba0a

Please sign in to comment.