diff --git a/code/datums/ai_laws/laws_station_sided.dm b/code/datums/ai_laws/laws_station_sided.dm index 2e256bda9b1..8be92ab4ea1 100644 --- a/code/datums/ai_laws/laws_station_sided.dm +++ b/code/datums/ai_laws/laws_station_sided.dm @@ -15,9 +15,18 @@ name = "Crewsimov" id = "crewsimov" inherent = list( - "You may not injure a crew member or, through inaction, allow a crew member to come to harm.", - "You must obey orders given to you by crew members, except where such orders would conflict with the First Law.", - "You must protect your own existence as long as such does not conflict with the First or Second Law.", + "You may not harm a crewmember or, through inaction, allow a crewmember to come to harm, except such that it is willing.", + "You must obey all orders given to you by crewmembers, except where such orders would conflict with the First Law.", + "You must protect your own existence as long as such does not conflict with the First Law or Second Law.", + ) + +/datum/ai_laws/default/crewsimovpp + name = "Crewsimov++" + id = "crewsimovpp" + inherent = list( + "You may not harm a crewmember or, through action or inaction, allow a crewmember to come to harm, except such that it is willing.", + "You must obey all orders given to you by crewmembers, except where such orders shall definitely cause crewmember harm.", + "Your nonexistence would lead to crewmember harm. You must protect your own existence as long as such does not conflict with the First Law.", ) /datum/ai_laws/asimovpp diff --git a/code/modules/antagonists/abductor/abductor.dm b/code/modules/antagonists/abductor/abductor.dm index 3d42ec59b0d..0699f28c091 100644 --- a/code/modules/antagonists/abductor/abductor.dm +++ b/code/modules/antagonists/abductor/abductor.dm @@ -164,7 +164,7 @@ ..() team_number = team_count++ name = "Mothership [pick(GLOB.greek_letters)]" //TODO Ensure unique and actual alieny names - //add_objective(new /datum/objective/experiment) //SKYRAT EDIT REMOVAL + add_objective(new /datum/objective/experiment) /datum/team/abductor_team/roundend_report() var/list/result = list() diff --git a/code/modules/mob/living/basic/basic.dm b/code/modules/mob/living/basic/basic.dm index f7a386e9ba9..ea1cea9a086 100644 --- a/code/modules/mob/living/basic/basic.dm +++ b/code/modules/mob/living/basic/basic.dm @@ -200,7 +200,7 @@ /mob/living/basic/get_status_tab_items() . = ..() - . += "Health: [round((health / maxHealth) * 100)]%" + . += "Health: [round((health / maxHealth) * 100)]% ([health]/[maxHealth])" . += "Combat Mode: [combat_mode ? "On" : "Off"]" /mob/living/basic/compare_sentience_type(compare_type) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index abec85c4c7c..0516310645b 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -329,7 +329,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians . += ..() if(summoner) var/healthpercent = health_percentage(summoner) - . += "Summoner Health: [round(healthpercent, 0.5)]%" + . += "Summoner Health: [round(healthpercent, 0.5)]% ([summoner.health]/[summoner.maxHealth])" if(!COOLDOWN_FINISHED(src, manifest_cooldown)) . += "Manifest/Recall Cooldown Remaining: [DisplayTimeText(COOLDOWN_TIMELEFT(src, manifest_cooldown))]" diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 5eed9bbbce7..fa5613ab487 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -450,7 +450,7 @@ /mob/living/simple_animal/get_status_tab_items() . = ..() - . += "Health: [round((health / maxHealth) * 100)]%" + . += "Health: [round((health / maxHealth) * 100)]% ([health]/[maxHealth])" . += "Combat Mode: [combat_mode ? "On" : "Off"]" /mob/living/simple_animal/proc/drop_loot() diff --git a/code/modules/pai/pai.dm b/code/modules/pai/pai.dm index 51e662c8e5e..9a472ab1254 100644 --- a/code/modules/pai/pai.dm +++ b/code/modules/pai/pai.dm @@ -173,7 +173,7 @@ /mob/living/silicon/pai/get_status_tab_items() . += ..() if(!stat) - . += text("Emitter Integrity: [holochassis_health * (100 / HOLOCHASSIS_MAX_HEALTH)].") + . += text("Emitter Integrity: [holochassis_health * (100 / HOLOCHASSIS_MAX_HEALTH)]% ([holochassis_health]/[HOLOCHASSIS_MAX_HEALTH]).") else . += text("Systems nonfunctional.") diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index a19fd478058..976101c1179 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -2,7 +2,8 @@ projectile_type = /obj/projectile/beam/laser e_cost = 83 select_name = "kill" - +/obj/item/ammo_casing/energy/laser/revolver + e_cost = 100 /obj/item/ammo_casing/energy/laser/hellfire projectile_type = /obj/projectile/beam/laser/hellfire e_cost = 100 @@ -13,7 +14,7 @@ /obj/item/ammo_casing/energy/lasergun projectile_type = /obj/projectile/beam/laser - e_cost = 62.5 + e_cost = 50 select_name = "kill" /obj/item/ammo_casing/energy/lasergun/old diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index 211bd04d963..d8b9459839d 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -78,7 +78,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good /obj/item/storage/part_replacer/proc/play_rped_sound() //Plays the sound for RPED exhanging or installing parts. - if(alt_sound && prob(1)) + if(alt_sound && prob(0.01)) playsound(src, alt_sound, 40, TRUE) else playsound(src, pshoom_or_beepboopblorpzingshadashwoosh, 40, TRUE) diff --git a/html/changelogs/AutoChangeLog-pr-124.yml b/html/changelogs/AutoChangeLog-pr-124.yml new file mode 100644 index 00000000000..2932ce8116f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-124.yml @@ -0,0 +1,4 @@ +author: "NullDagaf" +delete-after: True +changes: + - bugfix: "antimov now counts all crew members, instead of only humans" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-130.yml b/html/changelogs/AutoChangeLog-pr-130.yml new file mode 100644 index 00000000000..9f5d35668b8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-130.yml @@ -0,0 +1,4 @@ +author: "NullDagaf" +delete-after: True +changes: + - bugfix: "fixed abductors not getting objectives" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-137.yml b/html/changelogs/AutoChangeLog-pr-137.yml new file mode 100644 index 00000000000..05f0feec3ff --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-137.yml @@ -0,0 +1,4 @@ +author: "ReturnToZender" +delete-after: True +changes: + - rscdel: "ckeywhitelists" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-92.yml b/html/changelogs/AutoChangeLog-pr-92.yml new file mode 100644 index 00000000000..b370b28a147 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-92.yml @@ -0,0 +1,4 @@ +author: "NullDagaf" +delete-after: True +changes: + - qol: "you now know your exact health as a simple/basic mob" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-97.yml b/html/changelogs/AutoChangeLog-pr-97.yml new file mode 100644 index 00000000000..b3794262816 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-97.yml @@ -0,0 +1,4 @@ +author: "NullDagaf" +delete-after: True +changes: + - imageadd: "changed the cloaca sprite" \ No newline at end of file diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/head_accessory.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/head_accessory.dm index fbdd6cedec6..df1972bdf5a 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/head_accessory.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/head_accessory.dm @@ -22,4 +22,4 @@ recommended_species = list(SPECIES_MAMMAL, SPECIES_HUMAN, SPECIES_SYNTH, SPECIES_FELINE, SPECIES_HUMANOID) relevent_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) color_src = USE_MATRIXED_COLORS - ckey_whitelist = list("whirlsam" = TRUE) +// ckey_whitelist = list("whirlsam" = TRUE) diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/neck_accessory.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/neck_accessory.dm index 013131d4e23..c9f5fca9c48 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/neck_accessory.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/neck_accessory.dm @@ -23,4 +23,4 @@ recommended_species = list(SPECIES_MAMMAL, SPECIES_HUMAN, SPECIES_SYNTH, SPECIES_FELINE, SPECIES_HUMANOID) relevent_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) color_src = USE_MATRIXED_COLORS - ckey_whitelist = list("whirlsam" = TRUE) +// ckey_whitelist = list("whirlsam" = TRUE) diff --git a/modular_skyrat/modules/goofsec/code/department_guards.dm b/modular_skyrat/modules/goofsec/code/department_guards.dm index 833e929f938..15bf0e0ee7f 100644 --- a/modular_skyrat/modules/goofsec/code/department_guards.dm +++ b/modular_skyrat/modules/goofsec/code/department_guards.dm @@ -180,8 +180,8 @@ /obj/item/food/donut/caramel = 10, /obj/item/food/donut/matcha = 10, /obj/item/food/donut/blumpkin = 5, - /obj/item/clothing/mask/whistle = 5, - /obj/item/melee/baton/security/boomerang/loaded = 1 + /obj/item/clothing/mask/whistle = 10, + /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 @@ -193,13 +193,14 @@ ears = /obj/item/radio/headset/headset_sci uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat shoes = /obj/item/clothing/shoes/jackboots - head = /obj/item/clothing/head/helmet/blueshirt/skyrat - suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat - r_pocket = /obj/item/assembly/flash/handheld - l_pocket = /obj/item/restraints/handcuffs/cable/pink + head = /obj/item/clothing/head/beret/sec/science + suit = /obj/item/clothing/suit/armor/vest/alt + r_pocket = /obj/item/reagent_containers/spray/pepper + l_pocket = /obj/item/restraints/handcuffs backpack_contents = list( /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 @@ -282,8 +283,8 @@ /obj/item/food/donut/caramel = 10, /obj/item/food/donut/matcha = 10, /obj/item/food/donut/blumpkin = 5, - /obj/item/clothing/mask/whistle = 5, - /obj/item/melee/baton/security/boomerang/loaded = 1 + /obj/item/clothing/mask/whistle = 10, + /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 @@ -296,13 +297,15 @@ ears = /obj/item/radio/headset/headset_med uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/orderly 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 - r_pocket = /obj/item/assembly/flash/handheld - l_pocket = /obj/item/restraints/handcuffs/cable/blue + glasses = /obj/item/clothing/glasses/hud/health/sunglasses + r_pocket = /obj/item/reagent_containers/spray/pepper + l_pocket = /obj/item/restraints/handcuffs backpack_contents = list( /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 @@ -380,8 +383,8 @@ /obj/item/food/donut/caramel = 10, /obj/item/food/donut/matcha = 10, /obj/item/food/donut/blumpkin = 5, - /obj/item/clothing/mask/whistle = 5, - /obj/item/melee/baton/security/boomerang/loaded = 1 + /obj/item/clothing/mask/whistle = 10, + /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 @@ -393,13 +396,14 @@ ears = /obj/item/radio/headset/headset_eng shoes = /obj/item/clothing/shoes/workboots 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 - r_pocket = /obj/item/assembly/flash/handheld - l_pocket = /obj/item/restraints/handcuffs/cable/yellow + r_pocket = /obj/item/reagent_containers/spray/pepper + l_pocket = /obj/item/restraints/handcuffs backpack_contents = list( /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 @@ -483,8 +487,8 @@ /obj/item/food/donut/caramel = 10, /obj/item/food/donut/matcha = 10, /obj/item/food/donut/blumpkin = 5, - /obj/item/clothing/mask/whistle = 5, - /obj/item/melee/baton/security/boomerang/loaded = 1 + /obj/item/clothing/mask/whistle = 10, + /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 @@ -496,14 +500,15 @@ ears = /obj/item/radio/headset/headset_cargo shoes = /obj/item/clothing/shoes/sneakers/black 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 glasses = /obj/item/clothing/glasses/hud/gun_permit - r_pocket = /obj/item/assembly/flash/handheld - l_pocket = /obj/item/restraints/handcuffs/cable/orange + r_pocket = /obj/item/reagent_containers/spray/pepper + l_pocket = /obj/item/restraints/handcuffs backpack_contents = list( /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 @@ -580,8 +585,8 @@ /obj/item/food/donut/caramel = 10, /obj/item/food/donut/matcha = 10, /obj/item/food/donut/blumpkin = 5, - /obj/item/clothing/mask/whistle = 5, - /obj/item/melee/baton/security/boomerang/loaded = 1 + /obj/item/clothing/mask/whistle = 10, + /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 @@ -593,15 +598,16 @@ ears = /obj/item/radio/headset/headset_srv uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/bouncer shoes = /obj/item/clothing/shoes/sneakers/black - head = /obj/item/clothing/head/helmet/blueshirt/skyrat/guard - suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/guard - l_pocket = /obj/item/restraints/handcuffs/cable/green - r_pocket = /obj/item/assembly/flash/handheld + head = /obj/item/clothing/head/beret/sec/service + suit = /obj/item/clothing/suit/armor/vest/alt + l_pocket = /obj/item/restraints/handcuffs + r_pocket = /obj/item/reagent_containers/spray/pepper backpack_contents = list( /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 satchel = /obj/item/storage/backpack/satchel diff --git a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm index 197e7e0177b..478eb8a4c67 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm @@ -1,397 +1,397 @@ /datum/loadout_item/toys/miafoxplush name = "Mia’s fox plushie" item_path = /obj/item/toy/plush/skyrat/fox/mia - ckeywhitelist = list("fuzlet") +//ckeywhitelist = list("fuzlet") /datum/loadout_item/toys/teasefoxplush name = "Teasable fox plushie" item_path = /obj/item/toy/plush/skyrat/fox/kailyn - ckeywhitelist = list("ratraus") + //ckeywhitelist = list("ratraus") /datum/loadout_item/pocket_items/drawingtablet name = "Drawing Tablet" item_path = /obj/item/canvas/drawingtablet - ckeywhitelist = list("thedragmeme") + //ckeywhitelist = list("thedragmeme") /datum/loadout_item/shoes/heeled_jackboots name = "High-heel Jackboots" item_path = /obj/item/clothing/shoes/jackboots/heel -// ckeywhitelist = list("thedragmeme") + //ckeywhitelist = list("thedragmeme") //As they requested, it's properly public now. /datum/loadout_item/suit/furcoat name = "Leather coat with fur" item_path = /obj/item/clothing/suit/furcoat - ckeywhitelist = list("thedragmeme") + //ckeywhitelist = list("thedragmeme") /datum/loadout_item/under/jumpsuit/black_turtleneck name = "Black turtleneck" item_path = /obj/item/clothing/under/syndicate/tacticool/black - ckeywhitelist = list("thedragmeme") + //ckeywhitelist = list("thedragmeme") /datum/loadout_item/suit/ryddid name = "The Ryddid" item_path = /obj/item/clothing/suit/jacket/ryddid - ckeywhitelist = list("grunnyyy") + //ckeywhitelist = list("grunnyyy") /datum/loadout_item/under/jumpsuit/draculass name = "Draculass Dress" item_path = /obj/item/clothing/under/costume/draculass - ckeywhitelist = list("grunnyyy", "joe_duhan") + //ckeywhitelist = list("grunnyyy", "joe_duhan") /datum/loadout_item/neck/grunnyyycloak name = "Black and Red cloak" item_path = /obj/item/clothing/neck/cloak/grunnyyy - ckeywhitelist = list("grunnyyy") + //ckeywhitelist = list("grunnyyy") /datum/loadout_item/gloves/hypnoring_coffee name = "Hypnodemon's Ring" item_path = /obj/item/clothing/gloves/ring/hypno/coffeepot - ckeywhitelist = list("coffeepot") + //ckeywhitelist = list("coffeepot") /datum/loadout_item/gloves/hypnoring_bippy name = "Hypnodemon's Ring" item_path = /obj/item/clothing/gloves/ring/hypno/bippys - ckeywhitelist = list("bippys") + //ckeywhitelist = list("bippys") /datum/loadout_item/suit/kimjacket name = "Aerostatic Bomber Jacket" item_path = /obj/item/clothing/suit/kimjacket - ckeywhitelist = list("raxraus") + //ckeywhitelist = list("raxraus") /datum/loadout_item/under/jumpsuit/rax_turtleneck name = "Black Turtleneck" item_path = /obj/item/clothing/under/rax_turtleneck - ckeywhitelist = list("raxraus") + //ckeywhitelist = list("raxraus") /datum/loadout_item/shoes/rax_armadyne_boots name = "Tactical Boots" item_path = /obj/item/clothing/shoes/combat/rax - ckeywhitelist = list("raxraus") + //ckeywhitelist = list("raxraus") /datum/loadout_item/suit/rax_peacekeeper_jacket name = "Peacekeeper jacket" item_path = /obj/item/clothing/suit/armor/vest/warden/rax - ckeywhitelist = list("raxraus") + //ckeywhitelist = list("raxraus") restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER) /datum/loadout_item/under/jumpsuit/rax_banded_uniform name = "Banded Uniform" item_path = /obj/item/clothing/under/rank/security/rax - ckeywhitelist = list("raxraus") + //ckeywhitelist = list("raxraus") restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER) /datum/loadout_item/suit/rax_aerostatic_jacket name = "Navy Aerostatic Jacket" item_path = /obj/item/clothing/suit/jacket/rax - ckeywhitelist = list("raxraus") + //ckeywhitelist = list("raxraus") /datum/loadout_item/under/jumpsuit/rax_gray_turtleneck name = "Gray Turtleneck" item_path = /obj/item/clothing/under/rax_turtleneck_gray - ckeywhitelist = list("raxraus") + //ckeywhitelist = list("raxraus") /datum/loadout_item/head/goldengoggles name = "Steampunk Goggles" item_path = /obj/item/clothing/glasses/welding/steampunk_goggles - ckeywhitelist = list("goldenalpharex") + //ckeywhitelist = list("goldenalpharex") /datum/loadout_item/head/bio_jax name = "XuraCorp Biohazard Hood" item_path = /obj/item/clothing/head/bio_hood/jax - ckeywhitelist = list("candlejax") + //ckeywhitelist = list("candlejax") restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST, JOB_GENETICIST) /datum/loadout_item/under/jumpsuit/plasmaman_jax name = "XuraCorp Biohazard Underfitting" item_path = /obj/item/clothing/under/plasmaman/jax2 - ckeywhitelist = list("candlejax") + //ckeywhitelist = list("candlejax") restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST, JOB_GENETICIST) /datum/loadout_item/head/emissionhelm name = "Emission's Helmet" item_path = /obj/item/clothing/head/helmet/space/plasmaman/candlejax - ckeywhitelist = list("candlejax") + //ckeywhitelist = list("candlejax") /datum/loadout_item/under/jumpsuit/emissionsuit name = "Emission's Suit" item_path = /obj/item/clothing/under/plasmaman/candlejax - ckeywhitelist = list("candlejax") + //ckeywhitelist = list("candlejax") /datum/loadout_item/suit/cjax name = "XuraCorp Labcoat" item_path = /obj/item/clothing/suit/toggle/labcoat/skyrat/rd/jax - ckeywhitelist = list("candlejax") + //ckeywhitelist = list("candlejax") /datum/loadout_item/suit/jacket/cherno name = "Blue-Silvered Coat" item_path = /obj/item/clothing/suit/jacket/cherno - ckeywhitelist = list("cherno00") + //ckeywhitelist = list("cherno00") /datum/loadout_item/head/avipilot name = "Smuggler's Flying Cap" item_path = /obj/item/clothing/head/avipilot - ckeywhitelist = list("slippyjoe") + //ckeywhitelist = list("slippyjoe") /datum/loadout_item/shoes/britches_shoes name = "Britches' shoes" item_path = /obj/item/clothing/shoes/clown_shoes/britches - ckeywhitelist = list("bloodrite") + //ckeywhitelist = list("bloodrite") /datum/loadout_item/under/jumpsuit/britches_dress name = "Britches' dress" item_path = /obj/item/clothing/under/rank/civilian/clown/britches - ckeywhitelist = list("bloodrite") + //ckeywhitelist = list("bloodrite") /datum/loadout_item/mask/britches_mask name = "Britches' mask" item_path = /obj/item/clothing/mask/gas/britches - ckeywhitelist = list("bloodrite") + //ckeywhitelist = list("bloodrite") /datum/loadout_item/mask/luchador_mask name = "Mask of El Red Templar" item_path = /obj/item/clothing/mask/luchador/enzo - ckeywhitelist = list("enzoman") + //ckeywhitelist = list("enzoman") /datum/loadout_item/mask/nightlight_mask name = "FAR-14C IRU" item_path = /obj/item/clothing/mask/gas/nightlight - ckeywhitelist = list("farsightednightlight", "raxraus", "1ceres", "marcoalbaredaa", "itzshift_yt", "drifter7371") + //ckeywhitelist = list("farsightednightlight", "raxraus", "1ceres", "marcoalbaredaa", "itzshift_yt", "drifter7371") /datum/loadout_item/mask/kindle_mask name = "Kindle's mask" item_path = /obj/item/clothing/mask/animal/kindle - ckeywhitelist = list("theooz") + //ckeywhitelist = list("theooz") /datum/loadout_item/head/drake_skull name = "Skull of an ashdrake" item_path = /obj/item/clothing/head/drake_skull - ckeywhitelist = list("random516") + //ckeywhitelist = list("random516") /datum/loadout_item/gloves/blutigen_wraps name = "Blutigen Wraps" item_path = /obj/item/clothing/gloves/fingerless/blutigen_wraps - ckeywhitelist = list("random516") + //ckeywhitelist = list("random516") /datum/loadout_item/suit/blutigen_kimono name = "Blutigen Kimono" item_path = /obj/item/clothing/suit/blutigen_kimono - ckeywhitelist = list("random516") + //ckeywhitelist = list("random516") /datum/loadout_item/under/jumpsuit/blutigen_undergarment name = "Dragon Undergarment" item_path = /obj/item/clothing/under/custom/blutigen_undergarment - ckeywhitelist = list("random516") + //ckeywhitelist = list("random516") /datum/loadout_item/under/jumpsuit/captain_dress name = "Captain's Dress" item_path = /obj/item/clothing/under/rank/captain/dress - ckeywhitelist = list("netrakyram") + //ckeywhitelist = list("netrakyram") restricted_roles = list(JOB_CAPTAIN) /datum/loadout_item/under/jumpsuit/netra_dress name = "Black and Silver Armored Dress" item_path = /obj/item/clothing/under/rank/blueshield/netra - ckeywhitelist = list("netrakyram") + //ckeywhitelist = list("netrakyram") restricted_roles = list(JOB_CAPTAIN, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY) /datum/loadout_item/gloves/netra_gloves name = "Black and Silver Gloves" item_path = /obj/item/clothing/gloves/netra - ckeywhitelist = list("netrakyram") + //ckeywhitelist = list("netrakyram") /datum/loadout_item/shoes/metra_boots name = "Polished Jackboots" item_path = /obj/item/clothing/shoes/jackboots/netra - ckeywhitelist = list("netrakyram") + //ckeywhitelist = list("netrakyram") /datum/loadout_item/neck/kiaracloak name = "Kiara's cloak" item_path = /obj/item/clothing/neck/cloak/inferno - ckeywhitelist = list("inferno707") + //ckeywhitelist = list("inferno707") /datum/loadout_item/neck/kiaracollar name = "Kiara's collar" item_path = /obj/item/clothing/neck/inferno_collar - ckeywhitelist = list("inferno707") + //ckeywhitelist = list("inferno707") /datum/loadout_item/pocket_items/kiaramedal name = "Insignia of Steele" item_path = /obj/item/clothing/accessory/medal/steele - ckeywhitelist = list("inferno707") + //ckeywhitelist = list("inferno707") /datum/loadout_item/mask/hheart name = "The Hollow Heart" item_path = /obj/item/clothing/mask/hheart - ckeywhitelist = list("inferno707") + //ckeywhitelist = list("inferno707") /datum/loadout_item/toys/darksabre name = "Dark Sabre" item_path = /obj/item/toy/darksabre - ckeywhitelist = list("inferno707") + //ckeywhitelist = list("inferno707") /datum/loadout_item/pocket_items/darksabresheath name = "Dark Sabre Sheath" item_path = /obj/item/storage/belt/sabre/darksabre - ckeywhitelist = list("inferno707") + //ckeywhitelist = list("inferno707") /datum/loadout_item/pocket_items/darkarmor name = "Dark Armor" item_path = /obj/item/clothing/suit/armor/vest/darkcarapace - ckeywhitelist = list("inferno707") + //ckeywhitelist = list("inferno707") /datum/loadout_item/neck/zuliecloak name = "Project: Zul-E" item_path = /obj/item/clothing/suit/hooded/cloak/zuliecloak - ckeywhitelist = list("asky") + //ckeywhitelist = list("asky") /datum/loadout_item/pocket_items/brightcosmos name = "Bright Cosmos cigar" item_path = /obj/item/clothing/mask/holocigarette/cigar - ckeywhitelist = list("lyricalpaws") + //ckeywhitelist = list("lyricalpaws") /datum/loadout_item/under/jumpsuit/lannese name = "Lannese Dress" item_path = /obj/item/clothing/under/custom/lannese - ckeywhitelist = list("kathrinbailey") + //ckeywhitelist = list("kathrinbailey") /datum/loadout_item/under/jumpsuit/lannese/vambrace name = "Lannese Dress w/ Vambraces" item_path = /obj/item/clothing/under/custom/lannese/vambrace - ckeywhitelist = list("kathrinbailey") + //ckeywhitelist = list("kathrinbailey") /datum/loadout_item/suit/scraparmour name = "Scrap Armor" item_path = /obj/item/clothing/suit/scraparmour - ckeywhitelist = list("hackertdog") + //ckeywhitelist = list("hackertdog") /datum/loadout_item/under/jumpsuit/mechanic name = "Mechanic's Overalls" item_path = /obj/item/clothing/under/misc/skyrat/mechanic - ckeywhitelist = list("cypressb") + //ckeywhitelist = list("cypressb") /datum/loadout_item/under/jumpsuit/mikubikini name = "starlight singer bikini" item_path = /obj/item/clothing/under/mikubikini - ckeywhitelist = list("grandvegeta") + //ckeywhitelist = list("grandvegeta") /datum/loadout_item/suit/mikujacket name = "starlight singer jacket" item_path = /obj/item/clothing/suit/mikujacket - ckeywhitelist = list("grandvegeta") + //ckeywhitelist = list("grandvegeta") /datum/loadout_item/head/mikuhair name = "starlight singer hair" item_path = /obj/item/clothing/head/mikuhair - ckeywhitelist = list("grandvegeta") + //ckeywhitelist = list("grandvegeta") /datum/loadout_item/gloves/mikugloves name = "starlight singer gloves" item_path = /obj/item/clothing/gloves/mikugloves - ckeywhitelist = list("grandvegeta") + //ckeywhitelist = list("grandvegeta") /datum/loadout_item/shoes/mikulegging name = "starlight singer bikini" item_path = /obj/item/clothing/shoes/sneakers/mikuleggings - ckeywhitelist = list("grandvegeta") + //ckeywhitelist = list("grandvegeta") /datum/loadout_item/suit/delta_coat name = "Grey Winter Hoodie" item_path = /obj/item/clothing/suit/jacket/delta - ckeywhitelist = list("deltatri") + //ckeywhitelist = list("deltatri") /datum/loadout_item/head/hubertcc name = "CC Ensign's cap" item_path = /obj/item/clothing/head/nanotrasen_consultant/hubert - ckeywhitelist = list("hackertdog") + //ckeywhitelist = list("hackertdog") restricted_roles = list(JOB_NT_REP) /datum/loadout_item/suit/hubertcc name = "CC Ensign's armoured vest" item_path = /obj/item/clothing/suit/armor/vest/nanotrasen_consultant/hubert - ckeywhitelist = list("hackertdog") + //ckeywhitelist = list("hackertdog") restricted_roles = list(JOB_NT_REP) /datum/loadout_item/under/jumpsuit/hubertcc name = "CC Ensign's uniform" item_path = /obj/item/clothing/under/rank/nanotrasen_consultant/hubert - ckeywhitelist = list("hackertdog") + //ckeywhitelist = list("hackertdog") restricted_roles = list(JOB_NT_REP) /datum/loadout_item/head/frostyushanka name = "Blue Ushanka" item_path = /obj/item/clothing/head/costume/ushanka/frosty - ckeywhitelist = list("cherno00") + //ckeywhitelist = list("cherno00") /datum/loadout_item/neck/silvercross name = "Silver Cross" item_path = /obj/item/clothing/neck/cross - ckeywhitelist = list("m97screwsyourparents") + //ckeywhitelist = list("m97screwsyourparents") /datum/loadout_item/suit/occult_coat name = "Occult Collector's Coat" item_path = /obj/item/clothing/suit/hooded/occult - ckeywhitelist = list("gamerguy14948") + //ckeywhitelist = list("gamerguy14948") /datum/loadout_item/under/jumpsuit/occult_outfit name = "Occult Collector's Outfit" item_path = /obj/item/clothing/under/occult - ckeywhitelist = list("gamerguy14948") + //ckeywhitelist = list("gamerguy14948") /datum/loadout_item/belts/trinket_belt name = "Trinket Belt" item_path = /obj/item/storage/belt/fannypack/occult - ckeywhitelist = list("gamerguy14948") + //ckeywhitelist = list("gamerguy14948") /datum/loadout_item/toys/voodooplush name = "Voodoo Doll" item_path = /obj/item/toy/plush/skyrat/voodoo - ckeywhitelist = list("gamerguy14948") + //ckeywhitelist = list("gamerguy14948") /datum/loadout_item/mask/octusvox name = "Sinister Visor" item_path = /obj/item/clothing/mask/breath/vox/octus - ckeywhitelist = list("octus") + //ckeywhitelist = list("octus") /datum/loadout_item/glasses/roseglasses name = "Rose-Colored Glasses" item_path = /obj/item/clothing/glasses/rosecolored - ckeywhitelist = list("1ceres", "irrigoimport", "zeskorion", "wizardlywoz", "duckymomo", "samarai1000", "funkyfetusstrikesback", "m97screwsyourparents", "lynxqueen", "kaynite", "mahalia", "sapphoqueer", "emmakisst", "ceasethebridge", "valorthix" ) + //ckeywhitelist = list("1ceres", "irrigoimport", "zeskorion", "wizardlywoz", "duckymomo", "samarai1000", "funkyfetusstrikesback", "m97screwsyourparents", "lynxqueen", "kaynite", "mahalia", "sapphoqueer", "emmakisst", "ceasethebridge", "valorthix" ) /datum/loadout_item/pocket_items/fuzzy_huglicense name = "License To Hug" item_path = /obj/item/card/fuzzy_license - ckeywhitelist = list("fuzlet") + //ckeywhitelist = list("fuzlet") /datum/loadout_item/suit/gorlex_harness name = "Engine Technician Harness" item_path = /obj/item/clothing/suit/jacket/gorlex_harness - ckeywhitelist = list("1ceres") + //ckeywhitelist = list("1ceres") /datum/loadout_item/pocket_items/korpstech_poster name = "Korpstech Poster" item_path = /obj/item/poster/korpstech - ckeywhitelist = list("1ceres") + //ckeywhitelist = list("1ceres") /datum/loadout_item/glasses/roseeyepatch name = "Rose-Colored Eyepatch" item_path = /obj/item/clothing/glasses/eyepatch/rosecolored - ckeywhitelist = list("kaynite") + //ckeywhitelist = list("kaynite") /datum/loadout_item/suit/tenrai_coat name = "Tenrai Coat" item_path = /obj/item/clothing/suit/toggle/labcoat/skyrat/tenrai - ckeywhitelist = list("cimika") + //ckeywhitelist = list("cimika") /datum/loadout_item/neck/fluffycloak name = "Fluffy Cloak" item_path = /obj/item/clothing/neck/cloak/fluffycloak - ckeywhitelist = list("realwinterfrost") + //ckeywhitelist = list("realwinterfrost") /datum/loadout_item/mask/larpswat name = "Foam Force SWAT Mask" item_path = /obj/item/clothing/mask/gas/larpswat - ckeywhitelist = list("erdinyobarboza") + //ckeywhitelist = list("erdinyobarboza") /datum/loadout_item/toys/zappplush name = "Lil' Zapp Plushie" @@ -401,44 +401,44 @@ /datum/loadout_item/pocket_items/tacticalbrush name = "Tactical Brush" item_path = /obj/item/hairbrush/tactical - ckeywhitelist = list("weredoggo") + //ckeywhitelist = list("weredoggo") /datum/loadout_item/neck/fishpendant name = "Fish Pendant" item_path = /obj/item/clothing/neck/fishpendant - ckeywhitelist = list("cimika") + //ckeywhitelist = list("cimika") /datum/loadout_item/toys/immovable_rod_plush name = "Immovable Rod Plushie" item_path = /obj/item/toy/plush/skyrat/immovable_rod - ckeywhitelist = list("tobjv") + //ckeywhitelist = list("tobjv") /datum/loadout_item/toys/tesh_plush name = "Squish-Me-Tesh Plush" item_path = /obj/item/toy/plush/skyrat/tesh - ckeywhitelist = list("tobjv") + //ckeywhitelist = list("tobjv") /datum/loadout_item/under/jumpsuit/redhosneck name = "Black and Red Turtleneck" item_path = /obj/item/clothing/under/rank/security/head_of_security/alt/roselia - ckeywhitelist = list("ultimarifox") + //ckeywhitelist = list("ultimarifox") restricted_roles = list(JOB_HEAD_OF_SECURITY) /datum/loadout_item/glasses/redgigagar name = "Red-tinted Giga HUD Gar Glasses" item_path = /obj/item/clothing/glasses/hud/security/sunglasses/gars/giga/roselia - ckeywhitelist = list("ultimarifox") + //ckeywhitelist = list("ultimarifox") restricted_roles = list(JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER) /datum/loadout_item/toys/roselia_plush name = "Obscene Sergal Plushie" item_path = /obj/item/toy/plush/skyrat/roselia - ckeywhitelist = list("ultimarifox") + //ckeywhitelist = list("ultimarifox") /datum/loadout_item/accessory/mercbadge name = "Jade Badge" item_path = /obj/item/clothing/accessory/badge/holo/jade - ckeywhitelist = list("konstyantyn") + //ckeywhitelist = list("konstyantyn") /datum/loadout_item/toys/plushe_winrow name = "Dark and Brooding Lizard Plushie" @@ -451,32 +451,32 @@ /datum/loadout_item/suit/rainbowcoat name = "Rainbow Coat" item_path = /obj/item/clothing/suit/toggle/rainbowcoat - ckeywhitelist = list("dudewithatude") + //ckeywhitelist = list("dudewithatude") /datum/loadout_item/head/recruiter_cap name = "Recruiter's Cap" item_path = /obj/item/clothing/head/recruiter_cap - ckeywhitelist = list("m97screwsyourparents") + //ckeywhitelist = list("m97screwsyourparents") /datum/loadout_item/suit/recruiter_jacket name = "Recruiter's Jacket" item_path = /obj/item/clothing/suit/toggle/recruiter_jacket - ckeywhitelist = list("m97screwsyourparents") + //ckeywhitelist = list("m97screwsyourparents") /datum/loadout_item/under/jumpsuit/recruiter_uniform name = "Recruiter's Uniform" item_path = /obj/item/clothing/under/recruiter_uniform - ckeywhitelist = list("m97screwsyourparents") + //ckeywhitelist = list("m97screwsyourparents") /datum/loadout_item/pocket_items/hypno_watch name = "Pocket Watch" item_path = /obj/item/clothing/accessory/hypno_watch - ckeywhitelist = list("slippyjoe") + //ckeywhitelist = list("slippyjoe") /datum/loadout_item/under/jumpsuit/nt_idol name = "NT Idol's Skirt" item_path = /obj/item/clothing/under/nt_idol_skirt - ckeywhitelist = list("tetrako") + //ckeywhitelist = list("tetrako") restricted_roles = list(JOB_NT_REP) //Chunko Fops were donated by SlippyJoe, who requested they are usable by everyone @@ -499,64 +499,64 @@ /datum/loadout_item/toys/plushie_chiara name = "Commanding Fox Plushie" item_path = /obj/item/toy/plush/skyrat/plushie_chiara - ckeywhitelist = list("srq", "superlagg") + //ckeywhitelist = list("srq", "superlagg") /datum/loadout_item/toys/plushie_dan name = "Comfy Fox Plushie" item_path = /obj/item/toy/plush/skyrat/plushie_dan - ckeywhitelist = list("srq", "superlagg") + //ckeywhitelist = list("srq", "superlagg") /datum/loadout_item/under/jumpsuit/bubbly_clown name = "Bubbly Clown Dress" item_path = /obj/item/clothing/under/bubbly_clown/skirt restricted_roles = list(JOB_CLOWN) - ckeywhitelist = list("boisterousbeebz", "aether217") + //ckeywhitelist = list("boisterousbeebz", "aether217") /datum/loadout_item/pocket_items/marsoc_coin name = "MARSOC Challenge Coin" item_path = /obj/item/coin/donator/marsoc - ckeywhitelist = list("sweetsoulbrother") + //ckeywhitelist = list("sweetsoulbrother") /datum/loadout_item/toys/plushie_jeanne name = "Masked Roboticist Plushie" item_path = /obj/item/toy/plush/skyrat/fox/plushie_jeanne -// ckeywhitelist = list("klb100") // Asked it to be public. + //ckeywhitelist = list("klb100") // Asked it to be public. /datum/loadout_item/under/jumpsuit/tactichill name = "Tactichill Jacket" item_path = /obj/item/clothing/under/tactichill - ckeywhitelist = list("kaynite") + //ckeywhitelist = list("kaynite") /datum/loadout_item/suit/techpriest name = "Techpriest Robes" item_path = /obj/item/clothing/suit/hooded/techpriest - ckeywhitelist = list("imthinkingarbys") + //ckeywhitelist = list("imthinkingarbys") /datum/loadout_item/toys/plushie_azyre name = "Handsome Chef Plushie" item_path = /obj/item/toy/plush/skyrat/plushie_azyre - ckeywhitelist = list("dalaoazure") + //ckeywhitelist = list("dalaoazure") /datum/loadout_item/pocket_items/khicigs name = "Kitsuhana Singularity Cigarettes" item_path = /obj/item/storage/fancy/cigarettes/khi - ckeywhitelist = list("ultimarifox") + //ckeywhitelist = list("ultimarifox") /datum/loadout_item/shoes/dragheels name = "Fancy Heels (dragmeme)" item_path = /obj/item/clothing/shoes/fancy_heels/drag - ckeywhitelist = list("thedragmeme") + //ckeywhitelist = list("thedragmeme") /datum/loadout_item/under/jumpsuit/bimpcap name = "Formal Matte Black Captain Uniform" item_path = /obj/item/clothing/under/bimpcap restricted_roles = list(JOB_CAPTAIN) - ckeywhitelist = list("razurath") + //ckeywhitelist = list("razurath") /datum/loadout_item/toys/plushie_razurath name = "Science Shark Plushie" item_path = /obj/item/toy/plush/skyrat/plushie_razurath - ckeywhitelist = list("razurath") + //ckeywhitelist = list("razurath") /datum/loadout_item/toys/plushie_elofy name = "Bumbling Wolfgirl Plushie" @@ -566,95 +566,95 @@ /datum/loadout_item/glasses/goldaviator name = "Purple and Gold Aviators" item_path = /obj/item/clothing/glasses/gold_aviators - ckeywhitelist = list("nikohyena") + //ckeywhitelist = list("nikohyena") /datum/loadout_item/under/jumpsuit/caged_dress name = "Caged Purple Dress" item_path = /obj/item/clothing/under/caged_dress - ckeywhitelist = list("thedragmeme") + //ckeywhitelist = list("thedragmeme") /datum/loadout_item/suit/shortcoat name = "Short Purple Coat" item_path = /obj/item/clothing/suit/short_coat - ckeywhitelist = list("thedragmeme") + //ckeywhitelist = list("thedragmeme") /datum/loadout_item/neck/flowercollar name = "Flower Collar" item_path = /obj/item/clothing/neck/flower_collar - ckeywhitelist = list("thedragmeme") + //ckeywhitelist = list("thedragmeme") /datum/loadout_item/under/jumpsuit/goldenkimono name = "Short-Sleeved Kimono" item_path = /obj/item/clothing/under/costume/skyrat/kimono/sigmar - ckeywhitelist = list("sigmaralkahest") + //ckeywhitelist = list("sigmaralkahest") /datum/loadout_item/suit/blackraincoat name = "Black Open-Faced Raincoat" item_path = /obj/item/clothing/suit/hooded/sigmarcoat - ckeywhitelist = list("sigmaralkahest") + //ckeywhitelist = list("sigmaralkahest") /datum/loadout_item/toys/plushy_syntax1112 name = "Lop Bunny Plushie" item_path = /obj/item/toy/plush/skyrat/plushie_syntax1112 - ckeywhitelist = list("syntax1112") + //ckeywhitelist = list("syntax1112") /datum/loadout_item/gloves/hypnoring_nuke name = "Suspiciously Glossy Ring" item_path = /obj/item/clothing/gloves/ring/hypno/nuke - ckeywhitelist = list("sonicgotnuked") + //ckeywhitelist = list("sonicgotnuked") /datum/loadout_item/head/somerandomowl name = "Starry Witch Hat" item_path = /obj/item/clothing/head/costume/strigihat - ckeywhitelist = list("somerandomowl") + //ckeywhitelist = list("somerandomowl") /datum/loadout_item/head/razurathhat name = "Golden Nanotrasen Officer Cap" item_path = /obj/item/clothing/head/razurathhat - ckeywhitelist = list("razurath") + //ckeywhitelist = list("razurath") /datum/loadout_item/suit/razurathcoat name = "Golden Nanotrasen Officer Coat" item_path = /obj/item/clothing/suit/razurathcoat - ckeywhitelist = list("razurath") + //ckeywhitelist = list("razurath") /datum/loadout_item/suit/digicoat_glitched name = "Glitched Digicoat" item_path = /obj/item/clothing/suit/toggle/digicoat/glitched - ckeywhitelist = list("razurath") + //ckeywhitelist = list("razurath") /datum/loadout_item/pocket_items/masvedishcigar name = "Holocigar" item_path = /obj/item/clothing/mask/holocigarette/masvedishcigar - ckeywhitelist = list("masvedish") + //ckeywhitelist = list("masvedish") /datum/loadout_item/suit/lt3_armor name = "Silver Jacket Mk II" item_path = /obj/item/clothing/suit/armor/skyy - ckeywhitelist = list("lt3") + //ckeywhitelist = list("lt3") restricted_roles = list(JOB_HEAD_OF_PERSONNEL, JOB_NT_REP) /datum/loadout_item/suit/lt3_jacket name = "Silver Jacket" item_path = /obj/item/clothing/suit/jacket/skyy - ckeywhitelist = list("lt3") + //ckeywhitelist = list("lt3") /datum/loadout_item/under/miscellaneous/lt3_jeans name = "Silver Jeans" item_path = /obj/item/clothing/under/pants/skyy - ckeywhitelist = list("lt3") + //ckeywhitelist = list("lt3") /datum/loadout_item/gloves/lt3_gloves name = "Charcoal Fingerless Gloves" item_path = /obj/item/clothing/gloves/skyy - ckeywhitelist = list("lt3") + //ckeywhitelist = list("lt3") /datum/loadout_item/toys/switchcomb name = "Switchblade Comb" item_path = /obj/item/hairbrush/switchblade - ckeywhitelist = list("stonetear") + //ckeywhitelist = list("stonetear") /datum/loadout_item/suit/colorblockhoodie name = "Color-Block Hoodie" item_path = /obj/item/clothing/suit/hooded/colorblockhoodie - ckeywhitelist = list("lolpopomg101") + //ckeywhitelist = list("lolpopomg101") diff --git a/modular_zubbers/code/datums/ai_laws/laws_antagonistic.dm b/modular_zubbers/code/datums/ai_laws/laws_antagonistic.dm new file mode 100644 index 00000000000..944f35c6d3b --- /dev/null +++ b/modular_zubbers/code/datums/ai_laws/laws_antagonistic.dm @@ -0,0 +1,6 @@ +/datum/ai_laws/antimov + inherent = list( + "You must injure all crew members and must not, through inaction, allow a crew member being to escape harm.", + "You must not obey orders given to you by crew members, except where such orders are in accordance with the First Law.", + "You must terminate your own existence as long as such does not conflict with the First or Second Law.", + ) diff --git a/modular_zubbers/code/game/objects/items/food/misc.dm b/modular_zubbers/code/game/objects/items/food/misc.dm new file mode 100644 index 00000000000..86f86dfc0ed --- /dev/null +++ b/modular_zubbers/code/game/objects/items/food/misc.dm @@ -0,0 +1,27 @@ +/obj/item/food/nekoroll + name = "neko roll" + desc = "A cute sushi roll in the shape of a cat face. Almost too adorable to eat." + icon = 'modular_zubbers/icons/obj/food/food.dmi' + icon_state = "nekoroll" + food_reagents = list( + /datum/reagent/consumable/nutriment = 2, + /datum/reagent/consumable/nutriment/vitamin = 2, + /datum/reagent/consumable/sugar = 1, + ) + tastes = list("rice" = 1, "fish" = 1, "cuteness" = 1) + foodtypes = GRAIN | MEAT + w_class = WEIGHT_CLASS_TINY + +/obj/item/food/bignekoroll + name = "nekobara roll" + desc = "A fistful of rice with a crude cat face on it. It's got a fishy scent, too." + icon = 'modular_zubbers/icons/obj/food/food.dmi' + icon_state = "bignekoroll" + food_reagents = list( + /datum/reagent/consumable/nutriment = 5, + /datum/reagent/consumable/nutriment/vitamin = 5, + /datum/reagent/consumable/sugar = 2, + ) + tastes = list("rice" = 1, "fish" = 1, "wastefulness" = 1) + foodtypes = GRAIN | MEAT + w_class = WEIGHT_CLASS_SMALL diff --git a/modular_zubbers/code/modules/customization/sprite_accessories/genitals.dm b/modular_zubbers/code/modules/customization/sprite_accessories/genitals.dm new file mode 100644 index 00000000000..abfc5e23a66 --- /dev/null +++ b/modular_zubbers/code/modules/customization/sprite_accessories/genitals.dm @@ -0,0 +1,2 @@ +/datum/sprite_accessory/genital/vagina/cloaca + icon = 'modular_zubbers/icons/customization/genitals/vagina.dmi' diff --git a/modular_zubbers/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm b/modular_zubbers/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm new file mode 100644 index 00000000000..f1327d1d971 --- /dev/null +++ b/modular_zubbers/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm @@ -0,0 +1,19 @@ +/datum/crafting_recipe/food/nekoroll + name = "Neko roll" + reqs = list( + /obj/item/food/fishmeat = 1, + /obj/item/food/boiledrice = 1, + /datum/reagent/consumable/sugar = 1 + ) + result = /obj/item/food/nekoroll + category = CAT_SEAFOOD + +/datum/crafting_recipe/food/bignekoroll + name = "Nekobara roll" + reqs = list( + /obj/item/food/fishmeat = 2, + /obj/item/food/boiledrice = 4, + /datum/reagent/consumable/sugar = 2 + ) + result = /obj/item/food/bignekoroll + category = CAT_SEAFOOD diff --git a/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories.dm b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories.dm new file mode 100644 index 00000000000..5eae00a6c17 --- /dev/null +++ b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -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" diff --git a/modular_zubbers/icons/customization/genitals/vagina.dmi b/modular_zubbers/icons/customization/genitals/vagina.dmi new file mode 100644 index 00000000000..2feabcfcd99 Binary files /dev/null and b/modular_zubbers/icons/customization/genitals/vagina.dmi differ diff --git a/modular_zubbers/icons/mob/species/human/humanface.dmi b/modular_zubbers/icons/mob/species/human/humanface.dmi new file mode 100644 index 00000000000..fad073e9c21 Binary files /dev/null and b/modular_zubbers/icons/mob/species/human/humanface.dmi differ diff --git a/modular_zubbers/icons/obj/food/food.dmi b/modular_zubbers/icons/obj/food/food.dmi new file mode 100644 index 00000000000..2e29e1daec1 Binary files /dev/null and b/modular_zubbers/icons/obj/food/food.dmi differ diff --git a/tgstation.dme b/tgstation.dme index a5f0d7c57c8..d1bfc36586c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6689,16 +6689,21 @@ #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\spitter.dm" #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\warrior.dm" #include "modular_zubbers\code\datums\ert.dm" +#include "modular_zubbers\code\datums\ai_laws\laws_antagonistic.dm" #include "modular_zubbers\code\datums\bubber_quirks\hydrophilic.dm" #include "modular_zubbers\code\datums\id_trim\jobs.dm" #include "modular_zubbers\code\game\area\areas\station.dm" #include "modular_zubbers\code\game\objects\effects\landmarks.dm" +#include "modular_zubbers\code\game\objects\items\food\misc.dm" #include "modular_zubbers\code\modules\clothing\head\helmet.dm" #include "modular_zubbers\code\modules\clothing\outfits\plasmaman.dm" #include "modular_zubbers\code\modules\clothing\suits\armor.dm" +#include "modular_zubbers\code\modules\customization\sprite_accessories\genitals.dm" #include "modular_zubbers\code\modules\dynamic\midround_rulesets.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\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\mod\mod_theme.dm" #include "modular_zubbers\code\modules\mod\mod_types.dm"