cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-06-18 12:44:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Scuhf_
2023-04-05 08:44:22 +08:00
parent 4b52bd7711 88a8b386ea
commit 85b53f83fc
85 changed files with 1597 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/Deltastation/DeltaStation2_bubber.dmm
+615 -441
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/MetaStation/MetaStation_bubber.dmm
+109 -53
View File
@@ -1834,9 +1834,9 @@
/turf/open/floor/iron,
/area/station/construction/storage_wing)
"aII" = (
/obj/machinery/hydroponics/soil,
/obj/item/cultivator,
/obj/effect/decal/cleanable/dirt,
/obj/item/shovel/spade,
/obj/machinery/hydroponics/constructable,
/obj/structure/cable,
/turf/open/floor/grass,
/area/station/security/prison/garden)
"aIX" = (
@@ -3324,7 +3324,7 @@
/obj/machinery/chem_master/condimaster{
name = "CondiMaster Neo"
},
/turf/open/floor/iron/kitchen,
/turf/open/floor/iron/kitchen/small,
/area/station/security/prison/mess)
"bhb" = (
/obj/structure/window{
@@ -6465,6 +6465,11 @@
/area/station/maintenance/starboard/greater)
"csb" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/caution/stand_clear,
/obj/effect/turf_decal/stripes,
/obj/effect/turf_decal/stripes{
dir = 1
},
/turf/open/floor/iron/dark,
/area/station/security/prison)
"cst" = (
@@ -20398,6 +20403,7 @@
/obj/structure/railing/corner{
dir = 4
},
/obj/structure/drain,
/turf/open/floor/iron/dark/side{
dir = 4
},
@@ -21519,6 +21525,12 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/security/office)
"hNm" = (
/obj/structure/cable,
/obj/machinery/hydroponics/constructable,
/obj/machinery/power/apc/auto_name/directional/south,
/turf/open/floor/grass,
/area/station/security/prison/garden)
"hNw" = (
/obj/machinery/light/small/directional/south,
/obj/machinery/airalarm/directional/south,
@@ -22912,9 +22924,7 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"ilg" = (
/obj/machinery/hydroponics/soil,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/obj/machinery/hydroponics/constructable,
/turf/open/floor/grass,
/area/station/security/prison/garden)
"ilh" = (
@@ -23328,13 +23338,12 @@
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"irh" = (
/obj/machinery/hydroponics/soil,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/directional/west,
/obj/machinery/camera/directional/west{
c_tag = "Prison Garden";
network = list("ss13","prison")
},
/obj/machinery/hydroponics/constructable,
/turf/open/floor/grass,
/area/station/security/prison/garden)
"irp" = (
@@ -26203,10 +26212,10 @@
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
"jjM" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/green/filled/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/duct,
/obj/machinery/light_switch/directional/south,
/turf/open/floor/iron,
/area/station/security/prison/garden)
"jjN" = (
@@ -35695,6 +35704,7 @@
dir = 1
},
/obj/item/toy/beach_ball,
/obj/structure/drain,
/turf/open/floor/iron/terracotta/small,
/area/station/security/prison/rec)
"mxh" = (
@@ -39381,7 +39391,6 @@
/obj/effect/turf_decal/trimline/green/filled/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/south,
/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/security/prison/garden)
@@ -39680,6 +39689,7 @@
spawn_scatter_radius = 1
},
/obj/machinery/duct,
/obj/structure/drain,
/turf/open/floor/iron/freezer,
/area/station/security/prison/rec)
"nNH" = (
@@ -40570,6 +40580,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor,
/obj/machinery/duct,
/obj/effect/turf_decal/caution/stand_clear,
/obj/effect/turf_decal/stripes,
/obj/effect/turf_decal/stripes{
dir = 1
},
/turf/open/floor/iron/dark,
/area/station/security/prison/rec)
"odp" = (
@@ -41243,10 +41258,8 @@
/turf/open/floor/plating/airless,
/area/space/nearstation)
"opF" = (
/obj/machinery/hydroponics/soil,
/obj/item/cultivator,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/obj/machinery/hydroponics/constructable,
/turf/open/floor/grass,
/area/station/security/prison/garden)
"opG" = (
@@ -45179,6 +45192,11 @@
/area/station/science/explab)
"pJu" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/caution/stand_clear,
/obj/effect/turf_decal/stripes,
/obj/effect/turf_decal/stripes{
dir = 1
},
/turf/open/floor/iron/dark,
/area/station/security/prison/rec)
"pJA" = (
@@ -45252,6 +45270,14 @@
/area/station/security/detectives_office)
"pKu" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/trashcart,
/obj/item/instrument/bikehorn,
/obj/item/modular_computer/pda/clear,
/obj/item/modular_computer/pda/clear,
/obj/item/radio/headset,
/obj/item/radio/headset,
/obj/item/instrument/violin,
/obj/item/instrument/guitar,
/turf/open/floor/plating,
/area/station/security/prison/rec)
"pKv" = (
@@ -46209,6 +46235,11 @@
"qcd" = (
/turf/closed/wall/r_wall,
/area/station/engineering/atmos/pumproom)
"qcf" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
/turf/open/floor/plating,
/area/space)
"qcC" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
@@ -46955,6 +46986,20 @@
},
/turf/open/floor/engine/o2,
/area/station/engineering/atmos)
"qox" = (
/obj/structure/closet/crate/large,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/west,
/obj/item/seeds/bamboo,
/obj/item/wirecutters/makeshift,
/obj/effect/spawner/random/contraband/permabrig_gear,
/obj/effect/spawner/random/contraband/narcotics,
/obj/effect/spawner/random/contraband/cannabis,
/obj/item/modular_computer/pda/clear,
/obj/effect/spawner/random/engineering/material_cheap,
/obj/item/instrument/piano_synth,
/turf/open/floor/plating,
/area/station/security/prison/garden)
"qoA" = (
/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron/dark,
@@ -50627,8 +50672,10 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"rAW" = (
/obj/machinery/duct,
/turf/open/floor/iron,
/obj/item/cultivator,
/obj/machinery/hydroponics/constructable,
/obj/structure/cable,
/turf/open/floor/grass,
/area/station/security/prison/garden)
"rBe" = (
/obj/structure/table,
@@ -51502,7 +51549,7 @@
pixel_y = 22
},
/turf/open/floor/iron/dark/textured_large,
/area/station/security/prison/mess)
/area/station/security/prison)
"rOY" = (
/obj/structure/mirror/directional/east,
/obj/machinery/shower/directional/west,
@@ -51875,8 +51922,18 @@
/turf/open/floor/iron/white,
/area/station/medical/virology)
"rVb" = (
/obj/structure/sink/directional/west,
/obj/item/reagent_containers/cup/watering_can,
/obj/structure/closet/crate/hydroponics,
/obj/item/seeds/aloe,
/obj/item/seeds/banana,
/obj/item/seeds/carrot,
/obj/item/seeds/chanter,
/obj/item/seeds/cherry,
/obj/item/seeds/chili,
/obj/item/seeds/cocoapod,
/obj/item/seeds/corn,
/obj/item/seeds/cotton,
/obj/item/seeds/grape,
/obj/item/seeds/grass,
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 4
},
@@ -52331,10 +52388,9 @@
},
/area/station/medical/medbay/lobby)
"sbX" = (
/obj/machinery/hydroponics/soil,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/obj/item/plant_analyzer,
/obj/machinery/hydroponics/constructable,
/obj/structure/cable,
/turf/open/floor/grass,
/area/station/security/prison/garden)
"scb" = (
@@ -53458,21 +53514,10 @@
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
"swR" = (
/obj/structure/closet/crate/hydroponics,
/obj/item/seeds/aloe,
/obj/item/seeds/banana,
/obj/item/seeds/carrot,
/obj/item/seeds/chanter,
/obj/item/seeds/cherry,
/obj/item/seeds/chili,
/obj/item/seeds/cocoapod,
/obj/item/seeds/corn,
/obj/item/seeds/cotton,
/obj/item/seeds/grape,
/obj/item/seeds/grass,
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 4
},
/obj/structure/sink/kitchen/directional/west,
/turf/open/floor/iron,
/area/station/security/prison/garden)
"swV" = (
@@ -53733,6 +53778,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor,
/obj/machinery/duct,
/obj/effect/turf_decal/caution/stand_clear,
/obj/effect/turf_decal/stripes,
/obj/effect/turf_decal/stripes{
dir = 1
},
/turf/open/floor/iron/dark,
/area/station/security/prison)
"sBd" = (
@@ -61108,6 +61158,9 @@
/obj/structure/cable,
/turf/open/floor/carpet,
/area/station/service/chapel)
"uZF" = (
/turf/closed/wall/r_wall,
/area/space)
"uZK" = (
/obj/structure/sign/warning/vacuum/external/directional/north,
/obj/effect/turf_decal/stripes/line{
@@ -61364,6 +61417,9 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/plating,
/area/station/maintenance/disposal)
"vfy" = (
/turf/closed/wall,
/area/station/security/prison/garden)
"vfC" = (
/obj/machinery/vending/coffee,
/turf/open/floor/iron/dark,
@@ -61526,6 +61582,7 @@
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 4
},
/obj/item/reagent_containers/cup/watering_can,
/turf/open/floor/iron,
/area/station/security/prison/garden)
"viU" = (
@@ -65324,9 +65381,8 @@
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
"wyn" = (
/obj/machinery/hydroponics/soil,
/obj/item/shovel/spade,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/hydroponics/constructable,
/turf/open/floor/grass,
/area/station/security/prison/garden)
"wyo" = (
@@ -65751,11 +65807,11 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
"wFY" = (
/obj/machinery/hydroponics/soil,
/obj/item/shovel/spade,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light_switch/directional/east,
/turf/open/floor/grass,
/obj/effect/spawner/random/structure/girder{
loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50);
name = "falsewall or wall spawner"
},
/turf/open/floor/plating,
/area/station/security/prison/garden)
"wGk" = (
/obj/structure/cable,
@@ -89045,7 +89101,7 @@ sbX
irh
wyn
iOr
aaa
uZF
raz
aaa
aaa
@@ -89301,8 +89357,8 @@ tCC
qDS
tVo
ese
iOr
aaa
rAW
qcf
raz
raz
raz
@@ -89554,11 +89610,11 @@ aaa
cmB
qQK
fiA
rAW
fiA
tzk
bSb
nHB
iOr
hNm
iOr
aaa
aaa
@@ -89816,7 +89872,7 @@ swR
dTQ
rOP
aII
iOr
cmB
aUn
aUn
rrt
@@ -90072,9 +90128,9 @@ aXa
aXa
dHQ
jjM
ilg
cmB
aaa
vfy
iOr
uZF
mji
aaa
aaa
@@ -90330,8 +90386,8 @@ lyO
fbX
cnk
wFY
cmB
aaa
qox
uZF
aUn
aaa
aaa
@@ -90587,7 +90643,7 @@ aXa
nPK
bKT
wZz
sjP
wZz
sjP
sjP
sjP
_maps/map_files/tramstation/tramstation_bubber.dmm
+9 -9
View File
@@ -1374,7 +1374,6 @@
/turf/open/floor/iron,
/area/station/escapepodbay)
"adw" = (
/obj/machinery/hydroponics/soil,
/obj/machinery/power/apc/auto_name/directional/east,
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 6
@@ -1383,6 +1382,7 @@
dir = 1
},
/obj/structure/cable,
/obj/machinery/hydroponics/constructable,
/turf/open/floor/iron/dark,
/area/station/security/prison/garden)
"adx" = (
@@ -18581,11 +18581,11 @@
/turf/open/floor/iron,
/area/station/ai_monitored/security/armory)
"eRw" = (
/obj/machinery/hydroponics/soil,
/obj/machinery/firealarm/directional/west,
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 9
},
/obj/machinery/hydroponics/constructable,
/turf/open/floor/iron/dark,
/area/station/security/prison/garden)
"eRQ" = (
@@ -21637,12 +21637,12 @@
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
"fZX" = (
/obj/structure/grille,
/obj/structure/cable,
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 1
},
/obj/effect/spawner/structure/electrified_grille,
/turf/open/floor/plating,
/area/station/security/prison)
"gaf" = (
@@ -37265,13 +37265,13 @@
/turf/open/floor/iron/white,
/area/station/medical/virology)
"lQx" = (
/obj/machinery/hydroponics/soil,
/obj/machinery/status_display/ai/directional/south,
/obj/effect/turf_decal/trimline/green/filled/line,
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 4
},
/obj/item/cultivator,
/obj/machinery/hydroponics/constructable,
/turf/open/floor/iron/dark,
/area/station/security/prison/garden)
"lQC" = (
@@ -44249,12 +44249,12 @@
/turf/open/floor/iron,
/area/station/commons/fitness)
"otn" = (
/obj/machinery/hydroponics/soil,
/obj/machinery/status_display/evac/directional/north,
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 1
},
/obj/effect/turf_decal/trimline/neutral/filled/corner,
/obj/machinery/hydroponics/constructable,
/turf/open/floor/iron/dark,
/area/station/security/prison/garden)
"ots" = (
@@ -49175,11 +49175,11 @@
},
/area/station/science/breakroom)
"qjG" = (
/obj/machinery/hydroponics/soil,
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 10
},
/obj/item/plant_analyzer,
/obj/machinery/hydroponics/constructable,
/turf/open/floor/iron/dark,
/area/station/security/prison/garden)
"qjJ" = (
@@ -52017,8 +52017,8 @@
/turf/open/floor/engine,
/area/station/science/xenobiology)
"rkP" = (
/obj/machinery/hydroponics/soil,
/obj/effect/turf_decal/trimline/green/filled/line,
/obj/machinery/hydroponics/constructable,
/turf/open/floor/iron/dark,
/area/station/security/prison/garden)
"rlo" = (
@@ -53957,11 +53957,11 @@
/turf/open/floor/iron,
/area/station/security/prison)
"rZI" = (
/obj/machinery/hydroponics/soil,
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 1
},
/obj/item/shovel/spade,
/obj/machinery/hydroponics/constructable,
/turf/open/floor/iron/dark,
/area/station/security/prison/garden)
"rZS" = (
@@ -57977,13 +57977,13 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"tsw" = (
/obj/machinery/hydroponics/soil,
/obj/machinery/airalarm/directional/east,
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 5
},
/obj/effect/turf_decal/trimline/neutral/filled/corner,
/obj/item/cultivator,
/obj/machinery/hydroponics/constructable,
/turf/open/floor/iron/dark,
/area/station/security/prison/garden)
"tsP" = (
code/__DEFINES/~~bubber_defines/species.dm
+1
View File
@@ -0,0 +1 @@
#define SPECIES_SHADEKIN "shadekin"
code/datums/ai_laws/laws_station_sided.dm
+12 -3
View File
@@ -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
code/datums/id_trim/jobs.dm
+1
View File
@@ -785,6 +785,7 @@
ACCESS_EVA,
ACCESS_BRIG_ENTRANCE,
ACCESS_WEAPONS, //BUBBER EDIT
ACCESS_BLACKSMITH, //BUBBER EDIT
)
extra_access = list()
minimal_wildcard_access = list(
code/game/objects/items/spear.dm
+1 -5
View File
@@ -38,13 +38,9 @@
/obj/item/spear/Initialize(mapload)
. = ..()
force = force_unwielded
//decent in a pinch, but pretty bad.
AddComponent(/datum/component/jousting)
AddComponent(/datum/component/butchering, \
speed = 10 SECONDS, \
effectiveness = 70, \
)
AddComponent(/datum/component/butchering, speed = 10 SECONDS, effectiveness = 30)
AddComponent(/datum/component/two_handed, \
force_unwielded = force_unwielded, \
force_wielded = force_wielded, \
code/game/objects/structures/flora.dm
+4
View File
@@ -87,6 +87,8 @@ GLOBAL_LIST_EMPTY(flora_uprooting_tools_typepaths)
disallowed_tools = GLOB.flora_disallowed_tools_typepaths[type]
uprooting_tools = GLOB.flora_uprooting_tools_typepaths[type]
//BUBBER EDIT START - MOVED TO MODULAR
/*
/obj/structure/flora/attackby(obj/item/used_item, mob/living/user, params)
if(user.combat_mode)
return ..()
@@ -128,6 +130,8 @@ GLOBAL_LIST_EMPTY(flora_uprooting_tools_typepaths)
if(harvest(user))
after_harvest(user)
*/
//BUBBER EDIT END
/obj/structure/flora/attack_hand(mob/user, list/modifiers)
. = ..()
code/modules/antagonists/abductor/abductor.dm
+1 -1
View File
@@ -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()
code/modules/events/carp_migration.dm
+4 -4
View File
@@ -1,10 +1,10 @@
/datum/round_event_control/carp_migration
name = "Carp Migration"
typepath = /datum/round_event/carp_migration
weight = 15
min_players = 12
earliest_start = 10 MINUTES
max_occurrences = 6
weight = 10
min_players = 30
earliest_start = 45 MINUTES
max_occurrences = 2 //BUBBER EDIT: FIXES THIS DAMN CARP EVENT.
category = EVENT_CATEGORY_ENTITIES
description = "Summons a school of space carp."
code/modules/mining/equipment/kinetic_crusher.dm
+2 -6
View File
@@ -32,12 +32,8 @@
/obj/item/kinetic_crusher/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, \
speed = 6 SECONDS, \
effectiveness = 110, \
)
//technically it's huge and bulky, but this provides an incentive to use it
AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=20)
AddComponent(/datum/component/butchering, speed = 7 SECONDS, effectiveness = 40)
AddComponent(/datum/component/two_handed, force_unwielded = 0, force_wielded = 20)
/obj/item/kinetic_crusher/Destroy()
QDEL_LIST(trophies)
code/modules/mob/living/basic/basic.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/guardian/guardian.dm
+1 -1
View File
@@ -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))]"
code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
+5
View File
@@ -220,7 +220,12 @@
if((!QDELETED(spawner) && spawner.faction_check_mob(L)) || L.stat == DEAD)
continue
visible_message(span_danger("[src] grabs hold of [L]!"))
//BUBBER EDIT START
/*
L.Stun(100)
*/
L.Stun(75)
//BUBBER EDIT END
L.adjustBruteLoss(rand(10,15))
latched = TRUE
if(!latched)
code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm
-2
View File
@@ -50,8 +50,6 @@
/obj/projectile/temp/basilisk/ice
name = "ice blast"
damage = 5
speed = 1
pixel_speed_multiplier = 0.25
range = 200
nodamage = FALSE
temperature = -75
code/modules/mob/living/simple_animal/simple_animal.dm
+1 -1
View File
@@ -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()
code/modules/pai/pai.dm
+1 -1
View File
@@ -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.")
code/modules/projectiles/ammunition/energy/laser.dm
+6 -2
View File
@@ -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
@@ -119,3 +120,6 @@
/obj/item/ammo_casing/energy/nanite/cryo
projectile_type = /obj/projectile/energy/cryo
select_name = "cryo"
/obj/item/ammo_casing/energy/laser/blueshield
e_cost = 100
code/modules/research/stock_parts.dm
+1 -1
View File
@@ -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)
config/game_options.txt
+1
View File
@@ -419,6 +419,7 @@ ROUNDSTART_RACES aquatic
ROUNDSTART_RACES insect
ROUNDSTART_RACES synth
ROUNDSTART_RACES ghoul
ROUNDSTART_RACES shadekin
##-------------------------------------------------------------------------------------------
html/changelogs/AutoChangeLog-pr-124.yml
+4
View File
@@ -0,0 +1,4 @@
author: "NullDagaf"
delete-after: True
changes:
- bugfix: "antimov now counts all crew members, instead of only humans"
html/changelogs/AutoChangeLog-pr-130.yml
+4
View File
@@ -0,0 +1,4 @@
author: "NullDagaf"
delete-after: True
changes:
- bugfix: "fixed abductors not getting objectives"
html/changelogs/AutoChangeLog-pr-132.yml
+5
View File
@@ -0,0 +1,5 @@
author: "NullDagaf"
delete-after: True
changes:
- bugfix: "fixes demonic watchers' projectiles being abnormally slow"
- balance: "rebalanced goliaths to be more lethal"
html/changelogs/AutoChangeLog-pr-133.yml
+4
View File
@@ -0,0 +1,4 @@
author: "Scuhf-git"
delete-after: True
changes:
- rscadd: "Literally **ONE** cable"
html/changelogs/AutoChangeLog-pr-135.yml
+4
View File
@@ -0,0 +1,4 @@
author: "KathrinBailey"
delete-after: True
changes:
- rscadd: "Deltastation prison refurbished to add more activities."
html/changelogs/AutoChangeLog-pr-136.yml
+5
View File
@@ -0,0 +1,5 @@
author: "ReturnToZender"
delete-after: True
changes:
- rscadd: "loadout_item functionality"
- rscadd: "Lovers' Moth Plushie"
html/changelogs/AutoChangeLog-pr-137.yml
+4
View File
@@ -0,0 +1,4 @@
author: "ReturnToZender"
delete-after: True
changes:
- rscdel: "ckeywhitelists"
html/changelogs/AutoChangeLog-pr-139.yml
+5
View File
@@ -0,0 +1,5 @@
author: "projectkepler-ru"
delete-after: True
changes:
- balance: "added back the energy revolver to the blueshield arsenal and restored it's intended functionality as the founding father intended"
- imageadd: "a new blueshield revolver sprite ported from project kepler"
html/changelogs/AutoChangeLog-pr-141.yml
+4
View File
@@ -0,0 +1,4 @@
author: "ReturnToZender"
delete-after: True
changes:
- bugfix: "carp broke"
html/changelogs/AutoChangeLog-pr-142.yml
+4
View File
@@ -0,0 +1,4 @@
author: "ReturnToZender"
delete-after: True
changes:
- rscdel: "Hop on Bubberstation"
html/changelogs/AutoChangeLog-pr-144.yml
+4
View File
@@ -0,0 +1,4 @@
author: "NullDagaf"
delete-after: True
changes:
- balance: "crushers and spears are now terrible at butchering"
html/changelogs/AutoChangeLog-pr-145.yml
+5
View File
@@ -0,0 +1,5 @@
author: "NullDagaf"
delete-after: True
changes:
- balance: "removed planting on ash"
- bugfix: "fixed ash runes being horribly broken"
html/changelogs/AutoChangeLog-pr-147.yml
+4
View File
@@ -0,0 +1,4 @@
author: "NullDagaf"
delete-after: True
changes:
- rscadd: "added shadekin"
html/changelogs/AutoChangeLog-pr-148.yml
+4
View File
@@ -0,0 +1,4 @@
author: "NullDagaf"
delete-after: True
changes:
- bugfix: "fixes goliath stunlocking miners"
html/changelogs/AutoChangeLog-pr-152.yml
+4
View File
@@ -0,0 +1,4 @@
author: "projectkepler-ru"
delete-after: True
changes:
- bugfix: "PR didn't merge correctly, should work"
html/changelogs/AutoChangeLog-pr-92.yml
+4
View File
@@ -0,0 +1,4 @@
author: "NullDagaf"
delete-after: True
changes:
- qol: "you now know your exact health as a simple/basic mob"
html/changelogs/AutoChangeLog-pr-97.yml
+4
View File
@@ -0,0 +1,4 @@
author: "NullDagaf"
delete-after: True
changes:
- imageadd: "changed the cloaca sprite"
modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

modular_skyrat/modules/ashwalkers/code/buildings/ash_farming.dm
+2 -17
View File
@@ -1,6 +1,4 @@
/datum/component/simple_farm
///whether you can actually farm it at the moment
var/allow_plant = FALSE
///whether we limit the amount of plants you can have per turf
var/one_per_turf = TRUE
///the reference to the movable parent the component is attached to
@@ -13,8 +11,6 @@
if(!isatom(parent))
return COMPONENT_INCOMPATIBLE
atom_parent = parent
//important to allow people to just straight up set allowing to plant
allow_plant = set_plant
one_per_turf = set_turf_limit
pixel_shift = set_shift
//now lets register the signals
@@ -32,11 +28,6 @@
*/
/datum/component/simple_farm/proc/check_attack(datum/source, obj/item/attacking_item, mob/user)
SIGNAL_HANDLER
//if it behaves like a shovel
if(attacking_item.tool_behaviour == TOOL_SHOVEL)
//flip the allow plant-- we either cover or uncover the plantable bit
allow_plant = !allow_plant
atom_parent.balloon_alert_to_viewers("[allow_plant ? "uncovered" : "covered"] the growing place!")
//if its a seed, lets try to plant
if(istype(attacking_item, /obj/item/seeds))
@@ -61,11 +52,9 @@
* check_examine is meant to listen for the comsig_parent_examine signal, where it will put additional information in the examine
*/
/datum/component/simple_farm/proc/check_examine(datum/source, mob/user, list/examine_list)
if(allow_plant)
examine_list += span_notice("You are able to plant seeds here!")
SIGNAL_HANDLER
else
examine_list += span_warning("You need to use a shovel before you can plant seeds here!")
examine_list += span_notice("You are able to plant seeds here!")
/obj/structure/simple_farm
name = "simple farm"
@@ -236,7 +225,3 @@
creating_obj = planted_seed.type
new creating_obj(get_turf(src))
/turf/open/misc/asteroid/basalt/Initialize(mapload)
. = ..()
AddComponent(/datum/component/simple_farm)
modular_skyrat/modules/ashwalkers/code/effects/ash_ritual.dm
+25 -2
View File
@@ -51,13 +51,36 @@
for(var/checked_component in required_components)
var/set_direction = text2dir(checked_component)
var/turf/checked_turf = get_step(checked_rune, set_direction)
var/atom_check = locate(required_components[checked_component]) in checked_turf.contents
var/atom/movable/atom_check
if(ispath(required_components[checked_component], /mob/living))
var/fallback
for(var/mob/living/checked_mob in checked_turf)
if(checked_mob.stat == CONSCIOUS)
if(isnull(fallback))
fallback = checked_mob
continue
atom_check = checked_mob
atom_check ||= fallback
else
atom_check = locate(required_components[checked_component]) in checked_turf
if(!atom_check)
ritual_fail(checked_rune)
return FALSE
if(is_type_in_list(atom_check, consumed_components))
qdel(atom_check)
if(isliving(atom_check))
var/mob/living/sacrifice = atom_check
sacrifice.dust(TRUE, TRUE)
else if(isstack(atom_check))
var/obj/item/stack/stack = atom_check
stack.use(1)
else
qdel(atom_check)
checked_rune.balloon_alert_to_viewers("[checked_component] component has been consumed...")
else
modular_skyrat/modules/blueshield/code/blueshield.dm
+1 -1
View File
@@ -63,7 +63,7 @@
box = /obj/item/storage/box/survival/security
belt = /obj/item/modular_computer/pda/security
id = /obj/item/card/id/advanced/silver //BUBBER EDIT original: obj/item/card/id/advanced/CENTCOM
id = /obj/item/card/id/advanced/centcom
id_trim = /datum/id_trim/job/blueshield
/datum/outfit/plasmaman/blueshield
modular_skyrat/modules/blueshield/code/medkit.dm
+4 -2
View File
@@ -6,7 +6,9 @@
if(empty)
return
new /obj/item/stack/medical/gauze(src)
new /obj/item/stack/medical/bruise_pack(src)
new /obj/item/stack/medical/ointment(src)
new /obj/item/stack/medical/suture(src)
new /obj/item/stack/medical/mesh(src)
new /obj/item/healthanalyzer(src)
new /obj/item/pinpointer/crew(src)
//Probably would not need more than this
modular_skyrat/modules/blueshield/code/special.dm
+9 -6
View File
@@ -1,13 +1,13 @@
/obj/item/gun/energy/e_gun/revolver //The virgin gun.
name = "energy revolver"
desc = "An advanced energy revolver with the capacity to shoot both electrodes and lasers."
force = 7
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
name = "X-R12 energy revolver"
desc = "An experimental model advanced energy weapon with the capacity to shoot both electrodes and lasers, used by many private defense contractors from Romulus to New Moscow, its also rather heavy and would certainly hurt to get pistol whipped by."
force = 16
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser/blueshield)
ammo_x_offset = 1
charge_sections = 4
fire_delay = 4
icon = 'modular_skyrat/modules/blueshield/icons/energy.dmi'
icon_state = "bsgun"
icon_state = "bsalt"
inhand_icon_state = "minidisable"
lefthand_file = 'modular_skyrat/modules/blueshield/icons/guns_lefthand.dmi'
righthand_file = 'modular_skyrat/modules/blueshield/icons/guns_righthand.dmi'
@@ -15,10 +15,13 @@
cell_type = /obj/item/stock_parts/cell/blueshield
pin = /obj/item/firing_pin/implant/mindshield
selfcharge = TRUE
w_class = WEIGHT_CLASS_NORMAL
worn_icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi'
worn_icon_state = "bsrevolver"
/obj/item/stock_parts/cell/blueshield
name = "internal revolver power cell"
maxcharge = 1500
maxcharge = 1200
chargerate = 300
/obj/item/gun/energy/e_gun/revolver/pdw9 //The chad gun.
modular_skyrat/modules/blueshield/icons/energy.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 966 B

After

Width:  |  Height:  |  Size: 1.4 KiB

modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/head_accessory.dm
+1 -1
View File
@@ -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)
modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/neck_accessory.dm
+1 -1
View File
@@ -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)
modular_skyrat/modules/emotes/code/emotes.dm
+3 -3
View File
@@ -465,8 +465,8 @@
sound = 'modular_skyrat/modules/emotes/sound/voice/warbles.ogg'
/datum/emote/living/trills
key = "trills"
key_third_person = "trills!"
key = "trill"
key_third_person = "trills"
message = "trills!"
emote_type = EMOTE_AUDIBLE
vary = TRUE
@@ -490,7 +490,7 @@
/datum/emote/living/moo
key = "moo"
key_third_person = "moos!"
key_third_person = "moos"
message = "moos!"
emote_type = EMOTE_AUDIBLE
vary = TRUE
modular_skyrat/modules/goofsec/code/department_guards.dm
+39 -33
View File
@@ -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
modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm
+122 -122
View File
@@ -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")
modular_skyrat/modules/title_screen/code/_title_screen_defines.dm
+1 -1
View File
@@ -1,6 +1,6 @@
#define DEFAULT_TITLE_MAP_LOADTIME (150 SECONDS)
#define DEFAULT_TITLE_SCREEN_IMAGE 'modular_skyrat/modules/title_screen/icons/Bubber_title_screen.png'
#define DEFAULT_TITLE_SCREEN_IMAGE 'modular_skyrat/modules/title_screen/icons/skyrat_title_screen.png'
#define DEFAULT_TITLE_LOADING_SCREEN 'modular_skyrat/modules/title_screen/icons/loading_screen.gif'
#define TITLE_PROGRESS_CACHE_FILE "data/progress_cache.json"
modular_skyrat/modules/title_screen/icons/Bubber_title_screen.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 351 KiB

modular_zubbers/code/datums/ai_laws/laws_antagonistic.dm
+6
View File
@@ -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.",
)
modular_zubbers/code/game/objects/effects/items/plushes.dm
+5
View File
@@ -0,0 +1,5 @@
/obj/item/toy/plush/moth/lovers
name = "lovers moth plushie"
desc = "An adorable mothperson plushie. It's a lovely bug!"
icon = 'modular_zubbers/icons/obj/toys/plushes.dmi'
icon_state = "moffplush_lovers"
modular_zubbers/code/game/objects/items/food/misc.dm
+27
View File
@@ -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
modular_zubbers/code/game/objects/items/holy_weapons.dm
+38
View File
@@ -0,0 +1,38 @@
/obj/item/nullrod/papal_staff
name = "papal staff"
desc = "A staff used by traditional bishops and popes."
icon = 'modular_zubbers/icons/obj/items_and_weapons.dmi'
icon_state = "papal_staff"
inhand_icon_state = "papal_staff"
lefthand_file = 'modular_zubbers/icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'modular_zubbers/icons/mob/inhands/weapons/melee_righthand.dmi'
w_class = WEIGHT_CLASS_BULKY
attack_verb_continuous = list("smacks", "strucks", "cracks", "beats", "purifies")
attack_verb_simple = list("smack", "struck", "crack", "beat", "purify")
/obj/item/nullrod/papal_staff/get_belt_overlay()
return mutable_appearance('icons/blanks/32x32.dmi', "nothing")
/obj/item/clothing/head/mitre
name = "papal mitre"
desc = "A traditional headdress, worn by bishops and popes in traditional Christianity"
icon = 'modular_zubbers/icons/mob/clothing/hats.dmi'
worn_icon = 'modular_zubbers/icons/mob/clothing/32x48_head.dmi'
icon_state = "mitre"
/obj/item/clothing/suit/chaplainsuit/armor/papal
name = "papal robe"
desc = "A short cape over a cassock, worn by bishops and popes in traditional Christianity"
icon = 'modular_zubbers/icons/obj/clothing/suits.dmi'
worn_icon = 'modular_zubbers/icons/mob/clothing/suits.dmi'
icon_state = "papalrobe"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
/obj/item/storage/box/holy/papal
name = "Papal Kit"
typepath_for_preview = /obj/item/clothing/suit/chaplainsuit/armor/papal
/obj/item/storage/box/holy/papal/PopulateContents()
new /obj/item/clothing/head/mitre(src)
new /obj/item/clothing/suit/chaplainsuit/armor/papal(src)
modular_zubbers/code/modules/_defines.dm
+7
View File
@@ -0,0 +1,7 @@
#define HEAD_ACCESSORIES_PATHS list(\
/obj/item/clothing/head,\
/obj/item/clothing/glasses,\
/obj/item/reagent_containers/cup/bucket,\
/obj/item/paper,\
/obj/item/nullrod/fedora,\
)
modular_zubbers/code/modules/clothing/head/wig.dm
+73
View File
@@ -0,0 +1,73 @@
/obj/item/clothing/head/wig
var/obj/item/clothing/head/head_accessory
var/mutable_appearance/head_accessory_MA
var/overlay_on = FALSE
var/mob/living/carbon/holder
var/item_path
/obj/item/clothing/head/wig/attackby(obj/item/attachment, mob/living/user)
. = ..()
//Checks if the item is in the list of items available
for(var/type in HEAD_ACCESSORIES_PATHS)
if(istype(attachment, type))
item_path = type
break
if(item_path && !head_accessory)
add_head_accessory(attachment)
else
to_chat(user, span_notice("You can't put \the [attachment.name] on the head of \the [holder.name]"))
return
/obj/item/clothing/head/wig/proc/add_head_accessory(obj/item/clothing/attachment)
//Get the mutable_appearance ready
head_accessory_MA = mutable_appearance(attachment.worn_icon)
head_accessory_MA.icon_state = attachment.icon_state
attachment.forceMove(src) //Put the item in the wig
if(holder)
holder.add_overlay(head_accessory_MA)
overlay_on = TRUE
head_accessory = attachment
/obj/item/clothing/head/wig/attack_hand_secondary(mob/user)
..()
. = SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
if(head_accessory)
remove_head_accessory(user)
/obj/item/clothing/head/wig/proc/remove_head_accessory(mob/user)
user.put_in_active_hand(head_accessory)
head_accessory = null
item_path = null
if(holder)
holder.cut_overlay(head_accessory_MA)
overlay_on = FALSE
head_accessory_MA = null
/obj/item/clothing/head/wig/equipped(user, slot)
. = ..()
if(!(slot_flags & slot))
return
holder = user
if(head_accessory && !overlay_on)
holder.add_overlay(head_accessory_MA)
overlay_on = TRUE
/obj/item/clothing/head/wig/dropped(mob/user)
if(holder && overlay_on)
holder.cut_overlay(head_accessory_MA)
overlay_on = FALSE
holder = null
. = ..()
modular_zubbers/code/modules/customization/sprite_accessories/ears.dm
+5
View File
@@ -0,0 +1,5 @@
/datum/sprite_accessory/ears/shadekin
name = "Shadekin"
icon_state = "shadekin"
color_src = MUTCOLORS
icon = 'modular_zubbers/icons/customization/ears.dmi'
modular_zubbers/code/modules/customization/sprite_accessories/genitals.dm
+2
View File
@@ -0,0 +1,2 @@
/datum/sprite_accessory/genital/vagina/cloaca
icon = 'modular_zubbers/icons/customization/genitals/vagina.dmi'
modular_zubbers/code/modules/customization/sprite_accessories/tails.dm
+23
View File
@@ -0,0 +1,23 @@
/datum/sprite_accessory/tails/mammal/shadekin
name = "Shadekin"
icon_state = "shadekin"
icon = 'modular_zubbers/icons/customization/tails.dmi'
color_src = MUTCOLORS
/datum/sprite_accessory/tails/mammal/wagging/shadekin
name = "Shadekin"
icon_state = "shadekin"
icon = 'modular_zubbers/icons/customization/tails.dmi'
color_src = MUTCOLORS
/datum/sprite_accessory/tails/mammal/wagging/shadekinshort
name = "Shadekin Short"
icon_state = "shadekinshort"
icon = 'modular_zubbers/icons/customization/tails.dmi'
color_src = MUTCOLORS
/datum/sprite_accessory/tails/mammal/wagging/shadekinshort
name = "Shadekin Short"
icon_state = "shadekinshort"
icon = 'modular_zubbers/icons/customization/tails.dmi'
color_src = MUTCOLORS
modular_zubbers/code/modules/customization/sprite_accessories/taurs.dm
+15
View File
@@ -0,0 +1,15 @@
/datum/sprite_accessory/taur/shadekin
name = "Shadekin Long Tail"
icon_state = "shadekinlong"
icon = 'modular_zubbers/icons/customization/taur.dmi'
taur_mode = STYLE_TAUR_PAW
color_src = MUTCOLORS
extra = FALSE
/datum/sprite_accessory/taur/shadekin_long
name = "Shadekin Big Tail"
icon_state = "shadekinbig"
icon = 'modular_zubbers/icons/customization/taur.dmi'
taur_mode = STYLE_TAUR_PAW
color_src = MUTCOLORS
extra = FALSE
modular_zubbers/code/modules/fluff/flora/ash_flora.dm
+70
View File
@@ -0,0 +1,70 @@
/obj/structure/flora/ash/cacti
can_uproot = TRUE
/obj/structure/flora/attackby(obj/item/used_item, mob/living/user, params)
if(user.combat_mode)
return ..()
if(flags_1 & HOLOGRAM_1)
to_chat(user, "Your [used_item] goes right through \the [src]!")
return ..()
if(can_uproot && is_type_in_typecache(used_item, uprooting_tools))
if(uprooted)
if(locate(/obj/structure/flora) in (loc.contents - src))
to_chat(user, span_warning("There's already a plant here!"))
return
user.visible_message(
span_notice("[user] starts to replant [src]..."),
span_notice("You start to replant [src]...")
)
used_item.play_tool_sound(src, 50)
if(!do_after(user, harvest_time, src) || locate(/obj/structure/flora) in (loc.contents - src))
return
user.visible_message(
span_notice("[user] replants [src]."),
span_notice("You replant [src].")
)
replant()
else
user.visible_message(
span_notice("[user] starts to uproot [src]..."),
span_notice("You start to uproot [src]...")
)
used_item.play_tool_sound(src, 50)
if(!do_after(user, harvest_time, src))
return
user.visible_message(
span_notice("[user] uproots [src]."),
span_notice("You uproot [src].")
)
uproot()
used_item.play_tool_sound(src, 50)
return
if(!can_harvest(user, used_item))
return ..()
user.visible_message(
span_notice("[user] starts to [harvest_verb] [src]..."),
span_notice("You start to [harvest_verb] [src] with [used_item]...")
)
play_attack_sound(used_item.force)
if(!do_after(user, harvest_time * used_item.toolspeed, src))
return
visible_message(span_notice("[user] [harvest_verb][harvest_verb_suffix] [src]."), ignored_mobs = list(user))
play_attack_sound(used_item.force)
if(harvest(user))
after_harvest(user)
/obj/structure/flora/ash/cacti/uproot(mob/living/user)
. = ..()
qdel(GetComponent(/datum/component/caltrop))
/obj/structure/flora/ash/cacti/replant(mob/living/user)
. = ..()
AddComponent(/datum/component/caltrop, min_damage = 3, max_damage = 6, probability = 70)
modular_zubbers/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
+19
View File
@@ -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
modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_toys.dm
+4
View File
@@ -0,0 +1,4 @@
/datum/loadout_item/toys/moffplush_lovers
name = "Lovers moth plushie"
item_path = /obj/item/toy/plush/moth/lovers
donator_only = TRUE //Donor item for Basicguy20
modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories.dm
+162
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"
modular_zubbers/code/modules/mob/living/carbon/human/human.dm
+2
View File
@@ -0,0 +1,2 @@
/mob/living/carbon/human/species/mammal/shadekin
race = /datum/species/mammal/shadekin
modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm
+37
View File
@@ -0,0 +1,37 @@
/datum/species/mammal/shadekin
name = "Shadekin"
id = SPECIES_SHADEKIN
say_mod = "mars"
default_mutant_bodyparts = list(
"tail" = "Shadekin",
"snout" = "None",
"horns" = "None",
"ears" = "Shadekin",
"taur" = "None",
"fluff" = "None",
"wings" = "None",
"head_acc" = "None",
"neck_acc" = "None"
)
bodypart_overrides = list(
BODY_ZONE_HEAD = /obj/item/bodypart/head/shadekin,
BODY_ZONE_CHEST = /obj/item/bodypart/chest/shadekin,
BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/shadekin,
BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/shadekin,
BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/shadekin,
BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/shadekin
)
/datum/species/mammal/shadekin/prepare_human_for_preview(mob/living/carbon/human/human)
var/main_color = "#222222"
var/secondary_color = "#b8b8b8"
human.dna.features["mcolor"] = main_color
human.dna.features["mcolor2"] = secondary_color
human.dna.features["mcolor3"] = secondary_color
human.dna.species.mutant_bodyparts["ears"] = list(MUTANT_INDEX_NAME = "Shadekin", MUTANT_INDEX_COLOR_LIST = list(main_color, secondary_color, "#464646"))
human.dna.species.mutant_bodyparts["snout"] = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_COLOR_LIST = list(main_color, secondary_color, secondary_color))
human.dna.species.mutant_bodyparts["tail"] = list(MUTANT_INDEX_NAME = "Shadekin", MUTANT_INDEX_COLOR_LIST = list(main_color, "#4D4D4D", secondary_color))
human.update_mutant_bodyparts(TRUE)
human.update_body(TRUE)
modular_zubbers/code/modules/mob/mining/goliath.dm
+5
View File
@@ -0,0 +1,5 @@
/mob/living/simple_animal/hostile/asteroid/goliath
move_to_delay = 10
ranged_cooldown_time = 60
melee_damage_lower = 18
melee_damage_upper = 22
modular_zubbers/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
+25
View File
@@ -0,0 +1,25 @@
/obj/item/bodypart/head/shadekin
icon_greyscale = 'modular_zubbers/icons/mob/species/human_parts_greyscale.dmi'
limb_id = SPECIES_SHADEKIN
is_dimorphic = TRUE
/obj/item/bodypart/chest/shadekin
icon_greyscale = 'modular_zubbers/icons/mob/species/human_parts_greyscale.dmi'
limb_id = SPECIES_SHADEKIN
is_dimorphic = TRUE
/obj/item/bodypart/arm/left/shadekin
icon_greyscale = 'modular_zubbers/icons/mob/species/human_parts_greyscale.dmi'
limb_id = SPECIES_SHADEKIN
/obj/item/bodypart/arm/right/shadekin
icon_greyscale = 'modular_zubbers/icons/mob/species/human_parts_greyscale.dmi'
limb_id = SPECIES_SHADEKIN
/obj/item/bodypart/leg/left/shadekin
icon_greyscale = 'modular_zubbers/icons/mob/species/human_parts_greyscale.dmi'
limb_id = SPECIES_SHADEKIN
/obj/item/bodypart/leg/right/shadekin
icon_greyscale = 'modular_zubbers/icons/mob/species/human_parts_greyscale.dmi'
limb_id = SPECIES_SHADEKIN
modular_zubbers/icons/customization/ears.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 864 B

modular_zubbers/icons/customization/genitals/vagina.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

modular_zubbers/icons/customization/tails.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

modular_zubbers/icons/customization/taur.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

modular_zubbers/icons/mob/clothing/32x48_head.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 635 B

modular_zubbers/icons/mob/clothing/hats.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 361 B

modular_zubbers/icons/mob/clothing/suits.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 659 B

modular_zubbers/icons/mob/inhands/weapons/melee_lefthand.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 338 B

modular_zubbers/icons/mob/inhands/weapons/melee_righthand.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 332 B

modular_zubbers/icons/mob/species/human/humanface.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

modular_zubbers/icons/mob/species/human_parts_greyscale.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

modular_zubbers/icons/obj/clothing/suits.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 411 B

modular_zubbers/icons/obj/food/food.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 954 B

modular_zubbers/icons/obj/items_and_weapons.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 423 B

modular_zubbers/icons/obj/toys/plushes.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

tgstation.dme
+16
View File
@@ -389,6 +389,7 @@
#include "code\__DEFINES\~skyrat_defines\_HELPERS\lighting.dm"
#include "code\__DEFINES\~~bubber_defines\access.dm"
#include "code\__DEFINES\~~bubber_defines\quirk_whitelist.dm"
#include "code\__DEFINES\~~bubber_defines\species.dm"
#include "code\__DEFINES\~~bubber_defines\traits.dm"
#include "code\__HELPERS\_auxtools_api.dm"
#include "code\__HELPERS\_lists.dm"
@@ -6689,19 +6690,34 @@
#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\effects\items\plushes.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\ears.dm"
#include "modular_zubbers\code\modules\customization\sprite_accessories\genitals.dm"
#include "modular_zubbers\code\modules\customization\sprite_accessories\tails.dm"
#include "modular_zubbers\code\modules\customization\sprite_accessories\taurs.dm"
#include "modular_zubbers\code\modules\dynamic\midround_rulesets.dm"
#include "modular_zubbers\code\modules\fluff\flora\ash_flora.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\loadouts\loadout_items\loadout_datum_toys.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\human.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\shadekin.dm"
#include "modular_zubbers\code\modules\mob\mining\goliath.dm"
#include "modular_zubbers\code\modules\mod\mod_theme.dm"
#include "modular_zubbers\code\modules\mod\mod_types.dm"
#include "modular_zubbers\code\modules\projectiles\guns\energy\pulse.dm"
#include "modular_zubbers\code\modules\surgery\bodyparts\species_parts\misc_bodyparts.dm"
#include "modular_zubbers\code\modules\vending\wardrobe.dm"
// END_INCLUDE