Skip to content

Commit

Permalink
Merge branch 'shiptest-ss13:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
thestripes authored Jun 26, 2024
2 parents bde36e7 + 5f611d4 commit 9b1794f
Show file tree
Hide file tree
Showing 93 changed files with 629 additions and 255 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@
/turf/open/floor/wood/walnut,
/area/ruin/beach/treasure_cove)
"sd" = (
/obj/structure/guncase,
/obj/structure/guncloset,
/obj/effect/turf_decal/industrial/warning{
dir = 4;
color = "#808080"
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1364,7 +1364,7 @@
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ruin/jungle/cavecrew/cargo)
"qz" = (
/obj/structure/guncase,
/obj/structure/guncloset,
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/effect/turf_decal/industrial/warning{
dir = 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1157,7 +1157,7 @@
/obj/effect/turf_decal/corner/opaque/red/border{
dir = 5
},
/obj/structure/guncase,
/obj/structure/guncloset,
/obj/item/gun/energy/e_gun,
/turf/open/floor/plasteel/dark,
/area/ruin/lavaland/factory/adminstrative)
Expand Down Expand Up @@ -2716,7 +2716,7 @@
/obj/item/ammo_box/magazine/smgm9mm{
start_empty = 1
},
/obj/item/gun/ballistic/automatic/smg/proto,
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto,
/turf/open/floor/plasteel/dark,
/area/ruin/lavaland/factory/dorms)
"zC" = (
Expand Down
12 changes: 6 additions & 6 deletions _maps/RandomRuins/SpaceRuins/spacemall.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9901,12 +9901,12 @@
"Lx" = (
/obj/structure/rack,
/obj/effect/turf_decal/corner/opaque/blue/half,
/obj/item/clothing/accessory/talisman,
/obj/item/clothing/accessory/wolftalisman,
/obj/item/clothing/accessory/talisman,
/obj/item/clothing/accessory/talisman,
/obj/item/clothing/accessory/wolftalisman,
/obj/item/clothing/accessory/wolftalisman,
/obj/item/clothing/accessory/bonearmlet,
/obj/item/clothing/neck/fangnecklace,
/obj/item/clothing/accessory/bonearmlet,
/obj/item/clothing/accessory/bonearmlet,
/obj/item/clothing/neck/fangnecklace,
/obj/item/clothing/neck/fangnecklace,
/obj/item/clothing/accessory/skilt,
/obj/item/clothing/accessory/skilt,
/obj/item/clothing/accessory/skilt,
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
/turf/open/floor/mineral/titanium/white,
/area/ruin/wasteplanet)
"kV" = (
/obj/structure/guncase,
/obj/structure/guncloset,
/turf/open/floor/mineral/titanium/white,
/area/ruin/wasteplanet)
"kZ" = (
Expand Down Expand Up @@ -797,7 +797,7 @@
/turf/open/floor/wood/waste,
/area/ruin/wasteplanet)
"Fn" = (
/obj/item/gun/ballistic/automatic/smg/proto{
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
pixel_y = -18
},
/obj/item/ammo_casing/spent{
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_dwayne.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2089,7 +2089,7 @@
/obj/effect/turf_decal/corner/opaque/yellow/three_quarters{
dir = 4
},
/obj/structure/guncase/shotgun,
/obj/structure/guncloset/shotgun,
/obj/item/gun/ballistic/shotgun/flamingarrow,
/obj/item/gun/ballistic/shotgun/flamingarrow,
/obj/item/gun/ballistic/shotgun/flamingarrow,
Expand Down
8 changes: 4 additions & 4 deletions _maps/shuttles/nanotrasen/nanotrasen_heron.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3374,13 +3374,13 @@
"mt" = (
/obj/structure/window/reinforced/spawner,
/obj/structure/rack,
/obj/item/gun/ballistic/automatic/smg/proto{
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
pixel_y = 3
},
/obj/item/gun/ballistic/automatic/smg/proto{
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
pixel_y = -2
},
/obj/item/gun/ballistic/automatic/smg/proto{
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
pixel_y = -7
},
/turf/open/floor/plasteel/tech,
Expand Down Expand Up @@ -11533,7 +11533,7 @@
/turf/open/floor/plasteel,
/area/ship/hallway/aft)
"Rs" = (
/obj/structure/guncase,
/obj/structure/guncloset,
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/turf/open/floor/plasteel/tech,
Expand Down
10 changes: 3 additions & 7 deletions _maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,14 @@
/obj/item/clothing/suit/armor/vest/security,
/obj/item/clothing/mask/gas/sechailer,
/obj/item/gps,
/obj/item/gun/ballistic/automatic/pistol/commander,
/obj/structure/railing{
dir = 4
},
/obj/item/ammo_box/c9mm,
/obj/item/ammo_box/c9mm,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/storage/belt/security/webbing,
/obj/item/storage/pistolcase/commander,
/turf/open/floor/wood,
/area/ship/security)
"bD" = (
Expand Down Expand Up @@ -3115,9 +3114,6 @@
/area/ship/engineering)
"Ha" = (
/obj/structure/closet/secure_closet/lp/lieutenant,
/obj/item/gun/energy/e_gun{
pixel_y = 1
},
/obj/item/stock_parts/cell/gun,
/obj/item/melee/classic_baton/telescopic,
/obj/item/kitchen/knife/combat/survival,
Expand All @@ -3131,12 +3127,12 @@
pixel_x = 7;
pixel_y = -20
},
/obj/item/gun/ballistic/automatic/pistol/commander,
/obj/item/ammo_box/c9mm,
/obj/item/ammo_box/c9mm,
/obj/item/ammo_box/c9mm/rubbershot,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/storage/pistolcase/commander,
/obj/item/storage/pistolcase/egun,
/turf/open/floor/wood,
/area/ship/crew/dorm)
"Hd" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/pirate/pirate_tortuga.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@
/obj/effect/turf_decal/techfloor{
dir = 10
},
/obj/structure/guncase{
/obj/structure/guncloset{
anchored = 1
},
/obj/item/gun/ballistic/automatic/assault/skm/pirate,
Expand Down Expand Up @@ -3140,7 +3140,7 @@
/area/ship/maintenance/port)
"Px" = (
/obj/effect/turf_decal/techfloor,
/obj/structure/guncase{
/obj/structure/guncloset{
anchored = 1
},
/obj/item/gun/ballistic/automatic/pistol/candor,
Expand Down
6 changes: 2 additions & 4 deletions _maps/shuttles/roumain/srm_elder.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,7 @@
/turf/open/floor/grass/ship/jungle,
/area/ship/hallway/central)
"ox" = (
/obj/structure/guncase,
/obj/structure/guncloset,
/obj/machinery/door/window/eastright{
dir = 8
},
Expand Down Expand Up @@ -2024,11 +2024,9 @@
/obj/item/gps{
pixel_x = -7
},
/obj/item/gun/ballistic/revolver/montagne,
/obj/item/storage/backpack/satchel/leather,
/obj/item/ammo_box/a44roum_speedloader,
/obj/item/ammo_box/a44roum_speedloader,
/obj/item/ammo_box/a44roum,
/obj/item/storage/pistolcase/montagne,
/obj/item/clothing/accessory/waistcoat/roumain,
/turf/open/floor/wood/mahogany,
/area/ship/bridge)
Expand Down
7 changes: 3 additions & 4 deletions _maps/shuttles/solgov/solgov_chronicle.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,9 @@
/obj/item/stamp/solgov,
/obj/item/clothing/suit/armor/solgov_trenchcoat,
/obj/item/spacecash/bundle/loadsamoney,
/obj/item/gun/ballistic/automatic/powered/gauss/modelh,
/obj/item/ammo_box/magazine/modelh,
/obj/item/ammo_box/magazine/modelh,
/obj/item/clothing/neck/cloak/solgovcap,
/obj/item/storage/pistolcase/modelh,
/obj/item/ammo_box/ferroslugbox,
/turf/open/floor/carpet/royalblue,
/area/ship/crew/office)
"cg" = (
Expand Down Expand Up @@ -3730,7 +3729,7 @@
/turf/open/floor/wood/walnut,
/area/ship/crew/crewtwo)
"Ks" = (
/obj/structure/guncase{
/obj/structure/guncloset{
desc = "A locker that holds weapons.";
name = "weapon locker"
},
Expand Down
5 changes: 2 additions & 3 deletions _maps/shuttles/solgov/solgov_inkwell.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5858,10 +5858,9 @@
},
/obj/item/fish_feed,
/obj/item/pen/fountain/solgov,
/obj/item/gun/ballistic/automatic/powered/gauss/modelh,
/obj/item/ammo_box/magazine/modelh,
/obj/item/ammo_box/magazine/modelh,
/obj/item/clothing/neck/cloak/solgovcap,
/obj/item/storage/pistolcase/modelh,
/obj/item/ammo_box/ferroslugbox,
/turf/open/floor/wood/maple,
/area/ship/crew/dorm/dormtwo)
"LJ" = (
Expand Down
5 changes: 2 additions & 3 deletions _maps/shuttles/solgov/solgov_paracelsus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3580,10 +3580,9 @@
},
/obj/item/fish_feed,
/obj/item/pen/fountain/solgov,
/obj/item/gun/ballistic/automatic/powered/gauss/modelh,
/obj/item/ammo_box/magazine/modelh,
/obj/item/ammo_box/magazine/modelh,
/obj/item/clothing/neck/cloak/solgovcap,
/obj/item/storage/pistolcase/modelh,
/obj/item/ammo_box/ferroslugbox,
/turf/open/floor/carpet/royalblue,
/area/ship/crew)
"IZ" = (
Expand Down
8 changes: 3 additions & 5 deletions _maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,10 @@
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
/obj/item/clothing/head/ngr/peaked,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/gun/ballistic/revolver,
/obj/item/ammo_box/a357/match,
/obj/item/ammo_box/a357/match,
/obj/item/ammo_box/a357/match,
/obj/item/pen/edagger,
/obj/item/storage/pistolcase/a357,
/obj/item/ammo_box/a357_box,
/turf/open/floor/carpet/black,
/area/ship/bridge)
"bJ" = (
Expand Down Expand Up @@ -1655,14 +1654,13 @@
/obj/item/clothing/glasses/welding,
/obj/item/storage/toolbox/syndicate,
/obj/item/wrench/combat,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/gun/ballistic/automatic/pistol,
/obj/item/clothing/accessory/holster,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/machinery/airalarm/directional/west,
/obj/item/clothing/suit/ngr,
/obj/item/clothing/head/hardhat/ngr/foreman,
/obj/item/tank/jetpack/suit,
/obj/item/storage/pistolcase/stechkin,
/turf/open/floor/carpet/red,
/area/ship/cargo/office)
"BB" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2732,7 +2732,7 @@
/obj/effect/turf_decal/industrial/fire{
dir = 8
},
/obj/structure/guncase,
/obj/structure/guncloset,
/obj/structure/railing,
/obj/item/gun/ballistic/automatic/smg/c20r,
/obj/machinery/light/directional/east,
Expand Down
11 changes: 5 additions & 6 deletions _maps/shuttles/syndicate/syndicate_twinkleshine.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
/obj/item/megaphone/sec{
name = "syndicate megaphone"
},
/obj/item/gun/ballistic/automatic/pistol/no_mag,
/obj/item/storage/pistolcase/stechkin,
/obj/item/clothing/head/HoS/beret/syndicate,
/obj/item/radio/headset/syndicate/alt/leader,
/obj/item/clothing/gloves/krav_maga/combatglovesplus,
Expand All @@ -121,6 +121,7 @@
name = "Armory Access";
req_access = list(3,150)
},
/obj/item/ammo_box/c10mm,
/turf/open/floor/mineral/plastitanium,
/area/ship/security)
"aE" = (
Expand Down Expand Up @@ -1792,7 +1793,7 @@
/obj/item/codespeak_manual{
charges = 2
},
/obj/item/gun/ballistic/revolver,
/obj/item/storage/pistolcase/a357,
/obj/item/megaphone/sec{
name = "syndicate megaphone"
},
Expand All @@ -1804,7 +1805,6 @@
/obj/item/clothing/head/HoS/syndicate,
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a357,
/turf/open/floor/carpet/nanoweave/red,
/area/ship/crew/dorm/dormtwo)
"ky" = (
Expand Down Expand Up @@ -7330,10 +7330,9 @@
/obj/item/radio/headset/syndicate/alt{
keyslot = null
},
/obj/item/gun/ballistic/automatic/powered/gauss/modelh,
/obj/item/storage/belt/sabre/solgov,
/obj/item/ammo_box/magazine/modelh,
/obj/item/ammo_box/magazine/modelh,
/obj/item/storage/pistolcase/modelh,
/obj/item/ammo_box/ferroslugbox,
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
"Qv" = (
Expand Down
5 changes: 1 addition & 4 deletions code/__HELPERS/names.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@
return "[pick(GLOB.squid_names)][pick("-", "", " ")][capitalize(pick(GLOB.squid_names) + pick(GLOB.squid_names))]"

/proc/kepori_name()
var/first_syllables = list("Fa", "Fe", "Fi", "Ma", "Me", "Mi", "Na", "Ne", "Ni", "Sa", "Se", "Si", "Ta", "Te", "Ti")
var/second_syllables = list("fa", "fe", "fi", "la", "le", "li", "ma", "me", "mi", "na", "ne", "ni", "ra", "re", "ri", "sa", "se", "si", "sha", "she", "shi", "ta", "te", "ti")
var/third_syllables = list("ca", "ce", "ci", "fa", "fe", "fi", "la", "le", "li", "ma", "me", "mi", "na", "ne", "ni", "ra", "re", "ri", "sa", "se", "si", "sha", "she", "shi", "ta", "te", "ti")
return "[pick(first_syllables)][pick(second_syllables)][pick(third_syllables)]"
return "[pick(GLOB.kepori_names)] [pick(GLOB.kepori_names)]-[pick(GLOB.kepori_names)]"

/proc/vox_name()
. = ""
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/lists/names.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ GLOBAL_LIST_INIT(first_names_female, world.file2list("strings/names/first_female
GLOBAL_LIST_INIT(last_names, world.file2list("strings/names/last.txt"))
GLOBAL_LIST_INIT(lizard_names_male, world.file2list("strings/names/lizard_male.txt"))
GLOBAL_LIST_INIT(lizard_names_female, world.file2list("strings/names/lizard_female.txt"))
GLOBAL_LIST_INIT(kepori_names, world.file2list("strings/names/kepori_names.txt"))
GLOBAL_LIST_INIT(clown_names, world.file2list("strings/names/clown.txt"))
GLOBAL_LIST_INIT(mime_names, world.file2list("strings/names/mime.txt"))
GLOBAL_LIST_INIT(carp_names, world.file2list("strings/names/carp.txt"))
Expand Down
18 changes: 8 additions & 10 deletions code/datums/components/crafting/recipes/tribal.dm
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
/datum/crafting_recipe/bonetalisman
name = "Bone Talisman"
result = /obj/item/clothing/accessory/talisman
/datum/crafting_recipe/bonearmlet
name = "Bone Armlet"
result = /obj/item/clothing/accessory/bonearmlet
time = 20
reqs = list(/obj/item/stack/sheet/bone = 2,
/obj/item/stack/sheet/sinew = 1)
category = CAT_PRIMAL

/datum/crafting_recipe/bonenecklace
name = "Hunter's Necklace"
result = /obj/item/clothing/accessory/wolftalisman
time = 35
reqs = list(/obj/item/stack/sheet/bone = 2,
/obj/item/stack/sheet/sinew = 3,
/obj/item/mob_trophy/wolf_ear = 2,
/datum/crafting_recipe/fangnecklace
name = "Wolf Fang Necklace"
result = /obj/item/clothing/neck/fangnecklace
time = 20
reqs = list(/obj/item/stack/sheet/sinew = 2,
/obj/item/mob_trophy/fang = 1)
category = CAT_PRIMAL

Expand Down
Loading

0 comments on commit 9b1794f

Please sign in to comment.