cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-31 08:37:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pr/560

Browse Source
This commit is contained in:
BongaTheProto
2022-10-30 14:13:50 -05:00
parent 039a5644e5 2de992e16b
commit d2df45e0bd
51 changed files with 19992 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_splurt/code/game/objects/items/cards_ids.dm
+16
View File
@@ -11,3 +11,19 @@
name = "Vampire ID"
desc = "An ID made to easily recognize vampires without needing to do tests"
icon_state = "vampire"
/obj/item/card/id/away/hotel/splurt
name = "Staff ID"
assignment = "Hotel Staff"
desc = "A staff ID used to access the hotel's doors."
access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MAINT, ACCESS_AWAY_ENGINE)
/obj/item/card/id/away/hotel/splurt/security
name = "Officer ID"
assignment = "Hotel Security"
access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MAINT, ACCESS_AWAY_SEC, ACCESS_AWAY_ENGINE)
/obj/item/card/id/away/hotel/manager
name = "Manager ID"
assignment = "Hotel Manager"
access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MAINT, ACCESS_AWAY_ENGINE, ACCESS_AWAY_SEC, ACCESS_AWAY_GENERIC1)
modular_splurt/code/game/objects/items/lewd_items/leash.dm
+1 -1
View File
@@ -92,7 +92,7 @@ Icons, maybe?
if(C.has_status_effect(/datum/status_effect/leash_pet)) //If the pet is already leashed, do not leash them. For the love of god.
to_chat(user, "<span class='notice'>[C] has already been leashed.</span>")
return
if(istype(C.get_item_by_slot(ITEM_SLOT_NECK), /obj/item/clothing/neck/petcollar) || istype(C.get_item_by_slot(ITEM_SLOT_NECK), /obj/item/electropack/shockcollar))
if(istype(C.get_item_by_slot(ITEM_SLOT_NECK), /obj/item/clothing/neck/petcollar) || istype(C.get_item_by_slot(ITEM_SLOT_NECK), /obj/item/electropack/shockcollar) || istype(C.get_item_by_slot(ITEM_SLOT_NECK), /obj/item/clothing/neck/necklace/cowbell) || istype(C.get_item_by_slot(ITEM_SLOT_NECK), /obj/item/clothing/neck/maid))
var/leashtime = 50
if(C.handcuffed)
leashtime = 5