cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-12 10:42:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Remove-all-ckey-whitelists

Browse Source
This commit is contained in:
ReturnToZender
2023-03-27 21:39:09 -05:00
committed by GitHub
parent a31cb55b4c 68cf3c9aac
commit 137fa11bd4
4 changed files with 202 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
modular_skyrat/modules/goofsec/code/department_guards.dm
View File

@@ -180,8 +180,8 @@
/obj/item/food/donut/caramel = 10, /obj/item/food/donut/caramel = 10,
/obj/item/food/donut/matcha = 10, /obj/item/food/donut/matcha = 10,
/obj/item/food/donut/blumpkin = 5, /obj/item/food/donut/blumpkin = 5,
/obj/item/clothing/mask/whistle = 5, /obj/item/clothing/mask/whistle = 10,
/obj/item/melee/baton/security/boomerang/loaded = 1 /obj/item/melee/baton = 5
) )
job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
@@ -193,13 +193,14 @@
ears = /obj/item/radio/headset/headset_sci ears = /obj/item/radio/headset/headset_sci
uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat
shoes = /obj/item/clothing/shoes/jackboots shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/helmet/blueshirt/skyrat head = /obj/item/clothing/head/beret/sec/science
suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat suit = /obj/item/clothing/suit/armor/vest/alt
r_pocket = /obj/item/assembly/flash/handheld r_pocket = /obj/item/reagent_containers/spray/pepper
l_pocket = /obj/item/restraints/handcuffs/cable/pink l_pocket = /obj/item/restraints/handcuffs
backpack_contents = list( backpack_contents = list(
/obj/item/melee/baton/security/loaded/departmental/science = 1, /obj/item/melee/baton/security/loaded/departmental/science = 1,
/obj/item/storage/box/gunset/pepperball = 1, /obj/item/gun/energy/disabler = 1,
/obj/item/holosign_creator/security = 1
) )
backpack = /obj/item/storage/backpack/science backpack = /obj/item/storage/backpack/science
@@ -282,8 +283,8 @@
/obj/item/food/donut/caramel = 10, /obj/item/food/donut/caramel = 10,
/obj/item/food/donut/matcha = 10, /obj/item/food/donut/matcha = 10,
/obj/item/food/donut/blumpkin = 5, /obj/item/food/donut/blumpkin = 5,
/obj/item/clothing/mask/whistle = 5, /obj/item/clothing/mask/whistle = 10,
/obj/item/melee/baton/security/boomerang/loaded = 1 /obj/item/melee/baton = 5
) )
job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
@@ -296,13 +297,15 @@
ears = /obj/item/radio/headset/headset_med ears = /obj/item/radio/headset/headset_med
uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/orderly uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/orderly
shoes = /obj/item/clothing/shoes/sneakers/white shoes = /obj/item/clothing/shoes/sneakers/white
head = /obj/item/clothing/head/helmet/blueshirt/skyrat/guard head = /obj/item/clothing/head/beret/sec/medical
suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/orderly suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/orderly
r_pocket = /obj/item/assembly/flash/handheld glasses = /obj/item/clothing/glasses/hud/health/sunglasses
l_pocket = /obj/item/restraints/handcuffs/cable/blue r_pocket = /obj/item/reagent_containers/spray/pepper
l_pocket = /obj/item/restraints/handcuffs
backpack_contents = list( backpack_contents = list(
/obj/item/melee/baton/security/loaded/departmental/medical = 1, /obj/item/melee/baton/security/loaded/departmental/medical = 1,
/obj/item/storage/box/gunset/pepperball = 1, /obj/item/gun/energy/disabler = 1,
/obj/item/holosign_creator/security = 1
) )
backpack = /obj/item/storage/backpack/medic backpack = /obj/item/storage/backpack/medic
@@ -380,8 +383,8 @@
/obj/item/food/donut/caramel = 10, /obj/item/food/donut/caramel = 10,
/obj/item/food/donut/matcha = 10, /obj/item/food/donut/matcha = 10,
/obj/item/food/donut/blumpkin = 5, /obj/item/food/donut/blumpkin = 5,
/obj/item/clothing/mask/whistle = 5, /obj/item/clothing/mask/whistle = 10,
/obj/item/melee/baton/security/boomerang/loaded = 1 /obj/item/melee/baton = 5
) )
job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
@@ -393,13 +396,14 @@
ears = /obj/item/radio/headset/headset_eng ears = /obj/item/radio/headset/headset_eng
shoes = /obj/item/clothing/shoes/workboots shoes = /obj/item/clothing/shoes/workboots
uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/engineering_guard uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/engineering_guard
head = /obj/item/clothing/head/helmet/blueshirt/skyrat/guard head = /obj/item/clothing/head/beret/sec/engineering
suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/engineering_guard suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/engineering_guard
r_pocket = /obj/item/assembly/flash/handheld r_pocket = /obj/item/reagent_containers/spray/pepper
l_pocket = /obj/item/restraints/handcuffs/cable/yellow l_pocket = /obj/item/restraints/handcuffs
backpack_contents = list( backpack_contents = list(
/obj/item/melee/baton/security/loaded/departmental/engineering = 1, /obj/item/melee/baton/security/loaded/departmental/engineering = 1,
/obj/item/storage/box/gunset/pepperball = 1, /obj/item/gun/energy/disabler = 1,
/obj/item/holosign_creator/security = 1
) )
backpack = /obj/item/storage/backpack/industrial backpack = /obj/item/storage/backpack/industrial
@@ -483,8 +487,8 @@
/obj/item/food/donut/caramel = 10, /obj/item/food/donut/caramel = 10,
/obj/item/food/donut/matcha = 10, /obj/item/food/donut/matcha = 10,
/obj/item/food/donut/blumpkin = 5, /obj/item/food/donut/blumpkin = 5,
/obj/item/clothing/mask/whistle = 5, /obj/item/clothing/mask/whistle = 10,
/obj/item/melee/baton/security/boomerang/loaded = 1 /obj/item/melee/baton = 5
) )
job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
@@ -496,14 +500,15 @@
ears = /obj/item/radio/headset/headset_cargo ears = /obj/item/radio/headset/headset_cargo
shoes = /obj/item/clothing/shoes/sneakers/black shoes = /obj/item/clothing/shoes/sneakers/black
uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/customs_agent uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/customs_agent
head = /obj/item/clothing/head/helmet/blueshirt/skyrat/guard head = /obj/item/clothing/head/beret/sec/cargo
suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/customs_agent suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/customs_agent
glasses = /obj/item/clothing/glasses/hud/gun_permit glasses = /obj/item/clothing/glasses/hud/gun_permit
r_pocket = /obj/item/assembly/flash/handheld r_pocket = /obj/item/reagent_containers/spray/pepper
l_pocket = /obj/item/restraints/handcuffs/cable/orange l_pocket = /obj/item/restraints/handcuffs
backpack_contents = list( backpack_contents = list(
/obj/item/melee/baton/security/loaded/departmental/cargo = 1, /obj/item/melee/baton/security/loaded/departmental/cargo = 1,
/obj/item/storage/box/gunset/pepperball = 1, /obj/item/gun/energy/disabler = 1,
/obj/item/holosign_creator/security = 1
) )
backpack = /obj/item/storage/backpack backpack = /obj/item/storage/backpack
@@ -580,8 +585,8 @@
/obj/item/food/donut/caramel = 10, /obj/item/food/donut/caramel = 10,
/obj/item/food/donut/matcha = 10, /obj/item/food/donut/matcha = 10,
/obj/item/food/donut/blumpkin = 5, /obj/item/food/donut/blumpkin = 5,
/obj/item/clothing/mask/whistle = 5, /obj/item/clothing/mask/whistle = 10,
/obj/item/melee/baton/security/boomerang/loaded = 1 /obj/item/melee/baton = 5
) )
job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
@@ -593,15 +598,16 @@
ears = /obj/item/radio/headset/headset_srv ears = /obj/item/radio/headset/headset_srv
uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/bouncer uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/bouncer
shoes = /obj/item/clothing/shoes/sneakers/black shoes = /obj/item/clothing/shoes/sneakers/black
head = /obj/item/clothing/head/helmet/blueshirt/skyrat/guard head = /obj/item/clothing/head/beret/sec/service
suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/guard suit = /obj/item/clothing/suit/armor/vest/alt
l_pocket = /obj/item/restraints/handcuffs/cable/green l_pocket = /obj/item/restraints/handcuffs
r_pocket = /obj/item/assembly/flash/handheld r_pocket = /obj/item/reagent_containers/spray/pepper
backpack_contents = list( backpack_contents = list(
/obj/item/melee/baton/security/loaded/departmental/service = 1, /obj/item/melee/baton/security/loaded/departmental/service = 1,
/obj/item/storage/box/gunset/pepperball = 1, /obj/item/gun/energy/disabler = 1,
/obj/item/holosign_creator/security = 1
) )
glasses = /obj/item/clothing/glasses/sunglasses glasses = /obj/item/clothing/glasses/hud/security/sunglasses
backpack = /obj/item/storage/backpack backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel satchel = /obj/item/storage/backpack/satchel

162
modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories.dm Normal file
View File

@@ -0,0 +1,162 @@
/datum/sprite_accessory/hair/hyenamane
name = "Hyena Mane"
icon_state = "hair_hyenamane"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
/datum/sprite_accessory/hair/taggot_franny
name = "Tail Hair"
icon_state = "hair_tailhair"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
/datum/sprite_accessory/hair/whor_eee
name = "((((((Hairfre))))))"
icon_state = "hair_hairfre"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
/datum/sprite_accessory/hair/sidehair
name = "Side Hair"
icon_state = "hair_tailhair2"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
/datum/sprite_accessory/hair/curtains
name = "Curtains"
icon_state = "hair_curtains"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
/datum/sprite_accessory/hair/aviancrest
name = "Avian Crest"
icon_state = "hair_aviancrest"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
/datum/sprite_accessory/hair/glamour
name = "Glamour"
icon_state = "hair_glamourh"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
//Podpeople hair
/datum/sprite_accessory/hair/podmale
name = "Pod Male"
icon_state = "pod_hair_m"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)
/datum/sprite_accessory/hair/podfemale
name = "Pod Female"
icon_state = "pod_hair_f"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)
/datum/sprite_accessory/hair/ivy
name = "Ivy"
icon_state = "pod_hair_ivy"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)
/datum/sprite_accessory/hair/cabbage
name = "Cabbage"
icon_state = "pod_hair_cabbage"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)
/datum/sprite_accessory/hair/spinach
name = "Spinach"
icon_state = "pod_hair_spinach"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)
/datum/sprite_accessory/hair/prayer
name = "Prayer"
icon_state = "pod_hair_prayer"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)
/datum/sprite_accessory/hair/vine
name = "Vine"
icon_state = "pod_hair_vine"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)
/datum/sprite_accessory/hair/shrub
name = "Shrub"
icon_state = "pod_hair_shrub"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)
/datum/sprite_accessory/hair/rose
name = "Rose"
icon_state = "pod_hair_rose"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)
/datum/sprite_accessory/hair/orchid
name = "Orchid"
icon_state = "pod_hair_orchid"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)
/datum/sprite_accessory/hair/fig
name = "Fig"
icon_state = "pod_hair_fig"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)
/datum/sprite_accessory/hair/hibiscus
name = "Hibiscus"
icon_state = "pod_hair_hibiscus"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK)
/datum/sprite_accessory/hair/emma
name = "Emma"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_emma"
/datum/sprite_accessory/hair/immovable
name = "Ozen"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_immovable"
/datum/sprite_accessory/hair/damsel
name = "Damsel"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_damsel"
/datum/sprite_accessory/hair/wavylong
name = "Long Wavy"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_wavylong"
/datum/sprite_accessory/hair/wavyovereye
name = "Wavy over eye"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_wavyovereye"
/datum/sprite_accessory/hair/straightovereye
name = "Straight over eye"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_straightovereye"
/datum/sprite_accessory/hair/straightside
name = "Side Straight"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_straightside"
/datum/sprite_accessory/hair/straightshort
name = "Straight Long"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_straightshort"
/datum/sprite_accessory/hair/straightlong
name = "Straight Long"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_straightlong"
/datum/sprite_accessory/hair/straightfloorlength
name = "Straight Long (Very)"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_straightfloorlength"
/datum/sprite_accessory/hair/deathhawk
name = "Deathhawk"
icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi'
icon_state = "hair_deathhawk"

BIN
modular_zubbers/icons/mob/species/human/humanface.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

1
tgstation.dme
View File

@@ -6703,6 +6703,7 @@
#include "modular_zubbers\code\modules\food_and_drinks\recipes\tablecraft\recipes_seafood.dm" #include "modular_zubbers\code\modules\food_and_drinks\recipes\tablecraft\recipes_seafood.dm"
#include "modular_zubbers\code\modules\jobs\job_types\blacksmith.dm" #include "modular_zubbers\code\modules\jobs\job_types\blacksmith.dm"
#include "modular_zubbers\code\modules\mapping\access_helpers.dm" #include "modular_zubbers\code\modules\mapping\access_helpers.dm"
#include "modular_zubbers\code\modules\mob\dead\new_player\sprite_accessories.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\felinid.dm" #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\felinid.dm"
#include "modular_zubbers\code\modules\mod\mod_theme.dm" #include "modular_zubbers\code\modules\mod\mod_theme.dm"
#include "modular_zubbers\code\modules\mod\mod_types.dm" #include "modular_zubbers\code\modules\mod\mod_types.dm"