shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter

Browse Source
This commit is contained in:
SandPoot
2023-01-28 01:20:26 -03:00
parent a56247f828 2d5e163916
commit 44913d5fff
171 changed files with 863 additions and 7090 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_globalvars/bitfields.dm
+153
View File
@@ -68,6 +68,25 @@ DEFINE_BITFIELD(area_flags, list(
"NO_ALERTS" = NO_ALERTS,
))
DEFINE_BITFIELD(body_parts_covered, list(
"ARM_LEFT" = ARM_LEFT,
"ARM_RIGHT" = ARM_RIGHT,
"ARMS" = ARMS,
"CHEST" = CHEST,
"FEET" = FEET,
"FOOT_LEFT" = FOOT_LEFT,
"FOOT_RIGHT" = FOOT_RIGHT,
"GROIN" = GROIN,
"HAND_LEFT" = HAND_LEFT,
"HAND_RIGHT" = HAND_RIGHT,
"HANDS" = HANDS,
"HEAD" = HEAD,
"LEG_LEFT" = LEG_LEFT,
"LEG_RIGHT" = LEG_RIGHT,
"LEGS" = LEGS,
"NECK" = NECK,
))
DEFINE_BITFIELD(car_traits, list(
"CAN_KIDNAP" = CAN_KIDNAP,
))
@@ -125,6 +144,11 @@ DEFINE_BITFIELD(disease_flags, list(
"CURABLE" = CURABLE,
))
DEFINE_BITFIELD(explosion_flags, list(
"EXPLOSION_FLAG_DENSITY_DEPENDENT" = EXPLOSION_FLAG_DENSITY_DEPENDENT,
"EXPLOSION_FLAG_HARD_OBSTACLE" = EXPLOSION_FLAG_HARD_OBSTACLE,
))
DEFINE_BITFIELD(flags_1, list(
"ADMIN_SPAWNED_1" = ADMIN_SPAWNED_1,
"BLOCK_FACE_ATOM_1" = BLOCK_FACE_ATOM_1,
@@ -147,6 +171,30 @@ DEFINE_BITFIELD(flags_1, list(
"UNUSED_RESERVATION_TURF_1" = UNUSED_RESERVATION_TURF_1,
))
DEFINE_BITFIELD(flags_cover, list(
"GLASSESCOVERSEYE" = GLASSESCOVERSEYES,
"HEADCOVERSEYES" = HEADCOVERSEYES,
"HEADCOVERSMOUTH" = HEADCOVERSMOUTH,
"MASKCOVERSEYES" = MASKCOVERSEYES,
"MASKCOVERSMOUTH" = MASKCOVERSMOUTH,
))
DEFINE_BITFIELD(flags_inv, list(
"HIDEACCESSORY" = HIDEACCESSORY,
"HIDEEARS" = HIDEEARS,
"HIDEEYES" = HIDEEYES,
"HIDEFACE" = HIDEFACE,
"HIDEFACIALHAI" = HIDEFACIALHAIR,
"HIDEGLOVES" = HIDEGLOVES,
"HIDEHAIR" = HIDEHAIR,
"HIDEJUMPSUIT" = HIDEJUMPSUIT,
"HIDEMASK" = HIDEMASK,
"HIDENECK" = HIDENECK,
"HIDESHOES" = HIDESHOES,
"HIDESNOUT" = HIDESNOUT,
"HIDESUITSTORA" = HIDESUITSTORAGE,
"HIDETAUR" = HIDETAUR,
))
DEFINE_BITFIELD(flags_ricochet, list(
"RICOCHET_SHINY" = RICOCHET_SHINY,
"RICOCHET_HARD" = RICOCHET_HARD
@@ -204,6 +252,12 @@ DEFINE_BITFIELD(item_flags, list(
"SLOWS_WHILE_IN_HAND" = SLOWS_WHILE_IN_HAND,
))
DEFINE_BITFIELD(material_flags, list(
"MATERIAL_ADD_PREFIX" = MATERIAL_ADD_PREFIX,
"MATERIAL_AFFECT_STATISTICS" = MATERIAL_AFFECT_STATISTICS,
"MATERIAL_COLOR" = MATERIAL_COLOR,
))
DEFINE_BITFIELD(mob_biotypes, list(
"MOB_BEAST" = MOB_BEAST,
"MOB_BUG" = MOB_BUG,
@@ -281,7 +335,21 @@ DEFINE_BITFIELD(pass_flags, list(
"PASSCLOSEDTURF" = PASSCLOSEDTURF,
"PASSGLASS" = PASSGLASS,
"PASSGRILLE" = PASSGRILLE,
"PASSMACHINE" = PASSMACHINE,
"PASSMOB" = PASSMOB,
"PASSSTRUCTURE" = PASSSTRUCTURE,
"PASSTABLE" = PASSTABLE,
))
DEFINE_BITFIELD(pass_flags_self, list(
"LETPASSTHROW" = LETPASSTHROW,
"PASSBLOB" = PASSBLOB,
"PASSCLOSEDTURF" = PASSCLOSEDTURF,
"PASSGLASS" = PASSGLASS,
"PASSGRILLE" = PASSGRILLE,
"PASSMACHINE" = PASSMACHINE,
"PASSMOB" = PASSMOB,
"PASSSTRUCTURE" = PASSSTRUCTURE,
"PASSTABLE" = PASSTABLE,
))
@@ -343,6 +411,29 @@ DEFINE_BITFIELD(sight, list(
"SEE_TURFS" = SEE_TURFS,
))
DEFINE_BITFIELD(slot_flags, list(
"ITEM_SLOT_BACK" = ITEM_SLOT_BACK,
"ITEM_SLOT_BACKPACK" = ITEM_SLOT_BACKPACK,
"ITEM_SLOT_BELT" = ITEM_SLOT_BELT,
"ITEM_SLOT_DEX_STORAGE" = ITEM_SLOT_DEX_STORAGE,
"ITEM_SLOT_EARS" = ITEM_SLOT_EARS,
"ITEM_SLOT_EYES" = ITEM_SLOT_EYES,
"ITEM_SLOT_FEET" = ITEM_SLOT_FEET,
"ITEM_SLOT_GLOVES" = ITEM_SLOT_GLOVES,
"ITEM_SLOT_HANDCUFFED" = ITEM_SLOT_HANDCUFFED,
"ITEM_SLOT_HANDS" = ITEM_SLOT_HANDS,
"ITEM_SLOT_HEAD" = ITEM_SLOT_HEAD,
"ITEM_SLOT_ICLOTHING" = ITEM_SLOT_ICLOTHING,
"ITEM_SLOT_ID" = ITEM_SLOT_ID,
"ITEM_SLOT_LEGCUFFED" = ITEM_SLOT_LEGCUFFED,
"ITEM_SLOT_LPOCKET" = ITEM_SLOT_LPOCKET,
"ITEM_SLOT_MASK" = ITEM_SLOT_MASK,
"ITEM_SLOT_NECK" = ITEM_SLOT_NECK,
"ITEM_SLOT_OCLOTHING" = ITEM_SLOT_OCLOTHING,
"ITEM_SLOT_RPOCKET" = ITEM_SLOT_RPOCKET,
"ITEM_SLOT_SUITSTORE" = ITEM_SLOT_SUITSTORE,
))
DEFINE_BITFIELD(smooth, list(
"SMOOTH_BORDER" = SMOOTH_BORDER,
"SMOOTH_DIAGONAL" = SMOOTH_DIAGONAL,
@@ -351,6 +442,15 @@ DEFINE_BITFIELD(smooth, list(
"SMOOTH_TRUE" = SMOOTH_TRUE,
))
DEFINE_BITFIELD(status_flags, list(
"CANKNOCKDOWN" = CANKNOCKDOWN,
"CANPUSH" = CANPUSH,
"CANSTAGGER" = CANSTAGGER,
"CANSTUN" = CANSTUN,
"CANUNCONSCIOUS" = CANUNCONSCIOUS,
"GODMODE" = GODMODE,
))
DEFINE_BITFIELD(storage_flags, list(
"STORAGE_LIMIT_COMBINED_W_CLASS" = STORAGE_LIMIT_COMBINED_W_CLASS,
"STORAGE_LIMIT_MAX_ITEMS" = STORAGE_LIMIT_MAX_ITEMS,
@@ -369,6 +469,59 @@ DEFINE_BITFIELD(vis_flags, list(
"VIS_UNDERLAY" = VIS_UNDERLAY,
))
DEFINE_BITFIELD(visor_flags, list(
"ALLOWINTERNALS" = ALLOWINTERNALS,
"BLOCK_GAS_SMOKE_EFFECT" = BLOCK_GAS_SMOKE_EFFECT,
"IGNORE_HAT_TOSS" = IGNORE_HAT_TOSS,
"LAVAPROTECT" = LAVAPROTECT,
"NOSLIP" = NOSLIP,
"NOSLIP_ICE" = NOSLIP_ICE,
"SCAN_REAGENTS" = SCAN_REAGENTS,
"STOPSPRESSUREDAMAGE" = STOPSPRESSUREDAMAGE,
"THICKMATERIAL" = THICKMATERIAL,
"VOICEBOX_DISABLED" = VOICEBOX_DISABLED,
"VOICEBOX_TOGGLABLE" = VOICEBOX_TOGGLABLE,
))
DEFINE_BITFIELD(visor_flags_cover, list(
"GLASSESCOVERSEYE" = GLASSESCOVERSEYES,
"HEADCOVERSEYES" = HEADCOVERSEYES,
"HEADCOVERSMOUTH" = HEADCOVERSMOUTH,
"MASKCOVERSEYES" = MASKCOVERSEYES,
"MASKCOVERSMOUTH" = MASKCOVERSMOUTH,
))
DEFINE_BITFIELD(visor_flags_inv, list(
"HIDEACCESSORY" = HIDEACCESSORY,
"HIDEEARS" = HIDEEARS,
"HIDEEYES" = HIDEEYES,
"HIDEFACE" = HIDEFACE,
"HIDEFACIALHAI" = HIDEFACIALHAIR,
"HIDEGLOVES" = HIDEGLOVES,
"HIDEHAIR" = HIDEHAIR,
"HIDEJUMPSUIT" = HIDEJUMPSUIT,
"HIDEMASK" = HIDEMASK,
"HIDENECK" = HIDENECK,
"HIDESHOES" = HIDESHOES,
"HIDESNOUT" = HIDESNOUT,
"HIDESUITSTORA" = HIDESUITSTORAGE,
"HIDETAUR" = HIDETAUR,
))
DEFINE_BITFIELD(vore_flags, list(
"ABSORBABLE" = ABSORBABLE,
"ABSORBED" = ABSORBED,
"DEVOURABLE" = DEVOURABLE,
"DIGESTABLE" = DIGESTABLE,
"FEEDING" = FEEDING,
"LICKABLE" = LICKABLE,
"MOBVORE" = MOBVORE,
"NO_VORE" = NO_VORE,
"SMELLABLE" = SMELLABLE,
"VOREPREF_INIT" = VOREPREF_INIT,
"VORE_INIT" = VORE_INIT,
))
DEFINE_BITFIELD(zap_flags, list(
"ZAP_ALLOW_DUPLICATES" = ZAP_ALLOW_DUPLICATES,
"ZAP_MACHINE_EXPLOSIVE" = ZAP_MACHINE_EXPLOSIVE,
code/_globalvars/lists/flavor_misc.dm
-35
View File
@@ -350,41 +350,6 @@ GLOBAL_LIST_INIT(greyscale_limb_types, list("human","moth","lizard","pod","plant
//body ids that have prosthetic sprites
GLOBAL_LIST_INIT(prosthetic_limb_types, list("xion","bishop","cybersolutions","grayson","hephaestus","nanotrasen","talon"))
//FAMILY HEIRLOOM LIST
//this works by using the first number for the species as a probability to choose one of the items in the following list for their family heirloom
//if the probability fails, or the species simply isn't in the list, then it defaults to the next global list, which has its own list of items for each job
//the first item in the list is for if your job isn't in that list
//species-heirloom list (we categorise them by the species id var)
GLOBAL_LIST_INIT(species_heirlooms, list(
"dwarf" = list(25, list(/obj/item/reagent_containers/food/drinks/dwarf_mug)), //example: 25% chance for dwarves to get a dwarf mug as their heirloom (normal container but has manly dorf icon)
"insect" = list(25, list(/obj/item/flashlight/lantern/heirloom_moth)),
"ipc" = list(25, list(/obj/item/stock_parts/cell/family)), //gives a broken powercell for flavor text!
"synthliz" = list(25, list(/obj/item/stock_parts/cell/family)), //they're also robots
"slimeperson" = list(25, list(/obj/item/toy/plush/slimeplushie)),
"lizard" = list(25, list(/obj/item/toy/plush/lizardplushie)),
))
//job-heirloom list
GLOBAL_LIST_INIT(job_heirlooms, list(
"NO_JOB" = list(/obj/item/toy/cards/deck, /obj/item/lighter, /obj/item/dice/d20),
"Clown" = list(/obj/item/paint/anycolor, /obj/item/bikehorn/golden),
"Mime" = list(/obj/item/paint/anycolor, /obj/item/toy/dummy),
"Cook" = list(/obj/item/kitchen/knife/scimitar),
"Botanist" = list(/obj/item/cultivator, /obj/item/reagent_containers/glass/bucket, /obj/item/storage/bag/plants, /obj/item/toy/plush/beeplushie),
"Medical Doctor" = list(/obj/item/healthanalyzer),
"Paramedic" = list(/obj/item/lighter), //..why?
"Station Engineer" = list(/obj/item/wirecutters/brass/family, /obj/item/crowbar/brass/family, /obj/item/screwdriver/brass/family, /obj/item/wrench/brass/family), //brass tools but without the tool speed modifier
"Atmospheric Technician" = list(/obj/item/extinguisher/mini/family),
"Lawyer" = list(/obj/item/storage/briefcase/lawyer/family),
"Janitor" = list(/obj/item/mop),
"Scientist" = list(/obj/item/toy/plush/slimeplushie),
"Assistant" = list(/obj/item/clothing/gloves/cut/family),
"Prisoner" = list (/obj/item/pen/blue),
"Chaplain" = list(/obj/item/camera/spooky/family),
"Head of Personnel" = list(/obj/item/pinpointer/ian)
))
//body ids that have non-gendered bodyparts
GLOBAL_LIST_INIT(nongendered_limb_types, list("fly", "zombie" ,"synth", "shadow", "cultgolem", "agent", "plasmaman", "clockgolem", "clothgolem"))
code/_globalvars/lists/maintenance_loot.dm
-2
View File
@@ -53,8 +53,6 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
/obj/item/airlock_painter/decal/tile = 1,
/obj/item/stack/cable_coil/random = 4,
/obj/item/stack/cable_coil/random/five = 6,
/obj/item/mod/construction/broken_core = 5,
/obj/item/mod/module/springlock = 1,
/obj/item/stack/medical/suture = 1,
/obj/item/stack/rods/ten = 9,
/obj/item/stack/rods/twentyfive = 1,