Skip to content

Commit

Permalink
Fractals are invited (#4957)
Browse files Browse the repository at this point in the history
* more borg QOL tweaks and airlocks to the people

Finally allows both research and medical borgs to partake in genetics via the medical gripper.
Fixes a small pathing issue I made with the paperwork gripper. Can now grip ALL types of data disks.
Good news anyone can now craft airlocks and it is no longer bound to the guild handyman perk. Bad news! Drones and by extent AIs can no longer produce guild products.

* fractals are invited

Makes some changes to fractal rosaries. After a gander at are updated lore (that I wont explain here go read it) they where deserving of being able to open public church doors. Round start being just the commons.

Updates its desc to convey this.

Removes it from the church vender as it should have been awhile ago honestly. Church can print them now anyways.

* Revert "more borg QOL tweaks and airlocks to the people"

This reverts commit 84881b4.

* Update holy_door.dm

cleaner code
  • Loading branch information
benj8560 authored Jan 24, 2024
1 parent a74ce66 commit 2fdbcfd
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 4 deletions.
20 changes: 19 additions & 1 deletion code/game/machinery/doors/holy_door.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
var/next_beep_at = 0
var/locked = 0
var/minimal_holiness = CLEARANCE_COMMON // Compared with security_clearance on cruciform
var/allow_rosary = FALSE
var/open_sound_powered = 'sound/machines/airlock_open.ogg'
var/open_sound_unpowered = 'sound/machines/airlock_creaking.ogg'
var/obj/item/wedged_item


/obj/machinery/door/holy/preacher
name = "church portcullis"
desc = "A door crafted by the church that requires no power and doesn't seem to have panel you could open. This one requires higher ranking in the church to open."
Expand All @@ -19,9 +21,10 @@

/obj/machinery/door/holy/public
name = "church public door"
desc = "A door crafted by the church that requires no power and doesn't seem to have panel you could open. This one will open to anyone with an active cruciform."
desc = "A door crafted by the church that requires no power and doesn't seem to have panel you could open. This one will open to anyone with an active cruciform or fractals."
icon = 'icons/obj/doors/Door_holy_public.dmi'
minimal_holiness = CLEARANCE_NONE
allow_rosary = TRUE

/obj/item/clothing/accessory/cross // It belongs here
name = "tau cross necklace"
Expand Down Expand Up @@ -83,6 +86,21 @@
if(bingo)
return TRUE

if(allow_rosary)
if(istype(H.get_active_hand(), /obj/item/clothing/accessory/necklace/fractalrosary))
return TRUE

if(istype(H.wear_mask, /obj/item/clothing/accessory/necklace/fractalrosary))
return TRUE

if(istype(C))
for(var/obj/item/I in C.accessories)
if(istype(I, /obj/item/clothing/accessory/necklace/fractalrosary))
bingo = TRUE
break
if(bingo)
return TRUE

return FALSE

/obj/machinery/door/holy/attack_hand(mob/user)
Expand Down
2 changes: 0 additions & 2 deletions code/game/machinery/vendor/weapon_vendors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@
/obj/item/storage/backpack/satchel/neotheology = 5,
/obj/item/storage/backpack/neotheology = 5,
/obj/item/storage/backpack/sport/neotheology = 5,
/obj/item/clothing/accessory/necklace/fractalrosary = 15,
/obj/item/clothing/suit/storage/neotheosports = 5,
/obj/item/clothing/suit/storage/toggle/absolutehoodie = 5,
/obj/item/clothing/suit/greatcoat/absolutecoat= 5,
Expand Down Expand Up @@ -265,7 +264,6 @@
/obj/item/storage/backpack/satchel/neotheology = 20,
/obj/item/storage/backpack/neotheology = 20,
/obj/item/storage/backpack/sport/neotheology = 20,
/obj/item/clothing/accessory/necklace/fractalrosary = 5,
/obj/item/clothing/suit/storage/neotheosports = 40,
/obj/item/clothing/suit/storage/toggle/absolutehoodie = 50,
/obj/item/clothing/suit/greatcoat/absolutecoat= 45,
Expand Down
3 changes: 2 additions & 1 deletion code/modules/clothing/accessories/accessory.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1267,7 +1267,8 @@

/obj/item/clothing/accessory/necklace/fractalrosary
name = "Fractal Rosary"
desc = "This is an token given by the Church of Absolute to Fractals, members of the Church who are not yet or cannot be baptized for any reason."
desc = "This is an token given by the Church of Absolute to Fractals, members of the Church who are not yet or cannot be baptized for any reason. \
Anyone wearing it can open public church doors. You should do your best to keep it out of the hands of the non-faithful, lest it be abused."
icon_state = "fractal_rosary"
item_state = "fractal_rosary"

Expand Down

0 comments on commit 2fdbcfd

Please sign in to comment.