From a04542d474119d9ba0299d6b4d531ef480865d1f Mon Sep 17 00:00:00 2001 From: evilew Date: Tue, 2 Apr 2024 16:45:46 +0200 Subject: [PATCH] small tweaks just presets --- _maps/map_files/generic/CentCom.dmm | 8 ++++---- modular_citadel/code/modules/client/loadout/__donator.dm | 9 +++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 1ae4f0ab..0c463ca6 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -385,7 +385,7 @@ "cFK" = (/obj/machinery/hydroponics/constructable,/obj/machinery/light{dir = 8},/obj/effect/turf_decal/tile/green{dir = 1},/obj/effect/turf_decal/tile/green,/obj/effect/turf_decal/tile/green{dir = 4},/obj/effect/turf_decal/tile/green{dir = 8},/turf/open/floor/plasteel/white,/area/centcom/holding) "cFQ" = (/obj/item/storage/box/emps{pixel_x = 3; pixel_y = 3},/obj/item/storage/box/flashbangs,/obj/item/grenade/plastic/x4,/obj/item/grenade/plastic/x4,/obj/item/grenade/plastic/x4,/obj/structure/table/reinforced,/obj/item/clothing/ears/earmuffs,/obj/structure/reagent_dispensers/peppertank{pixel_x = 32},/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/centcom/ferry) "cGs" = (/obj/structure/table,/obj/item/taperecorder,/turf/open/floor/plasteel/dark,/area/fatlab) -"cHl" = (/obj/structure/table/wood,/obj/item/ammo_box/a357,/obj/item/ammo_box/a357,/obj/item/gun/ballistic/revolver/mateba,/obj/item/storage/belt/sabre/rapier,/obj/machinery/light/small{dir = 1},/turf/open/floor/carpet/royalblack,/area/centcom/ferry) +"cHl" = (/obj/structure/table/wood,/obj/item/ammo_box/a357,/obj/item/ammo_box/a357,/obj/machinery/light/small{dir = 1},/obj/item/gun/ballistic/revolver/mateba/moka,/obj/item/storage/belt/sabre/rapier,/turf/open/floor/carpet/royalblack,/area/centcom/ferry) "cHJ" = (/obj/effect/turf_decal/stripes/line,/obj/effect/turf_decal/tile/red{dir = 1},/turf/open/floor/plasteel/dark,/area/ctf) "cHV" = (/obj/effect/turf_decal/caution,/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/fatlab) "cJD" = (/obj/structure/table/wood,/obj/item/storage/box/drinkingglasses,/obj/item/reagent_containers/food/drinks/bottle/whiskey{pixel_y = 5},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/tdome/tdomeobserve) @@ -516,7 +516,7 @@ "dIR" = (/obj/structure/chair{dir = 1},/turf/open/floor/holofloor{dir = 2; icon_state = "chapel"},/area/holodeck/rec_center/chapelcourt) "dJb" = (/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white/side{dir = 8},/area/fatlab) "dJD" = (/obj/structure/ore_box,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/fatlab) -"dJP" = (/obj/machinery/light/small{dir = 4},/turf/open/floor/mineral/basaltstone_floor,/area/centcom/ferry) +"dJP" = (/obj/machinery/light/small{dir = 4},/obj/structure/table/glass,/obj/item/implanter/krav_maga{pixel_x = 3},/obj/item/implanter/mindshield{pixel_y = 5; pixel_x = 3},/obj/item/implanter/radio{pixel_y = 10; pixel_x = 3},/obj/item/implanter/adrenalin{pixel_x = -8},/obj/item/autosurgeon/thermal_eyes{pixel_x = -27; pixel_y = 6},/turf/open/floor/mineral/basaltstone_floor,/area/centcom/ferry) "dKa" = (/obj/machinery/computer/rdservercontrol{dir = 1},/turf/open/floor/plasteel/dark,/area/centcom/ferry) "dKh" = (/obj/machinery/status_display/evac{pixel_y = 32},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/centcom/ferry) "dKl" = (/obj/structure/table/wood/fancy,/obj/item/storage/book/bible,/turf/open/floor/holofloor{dir = 8; icon_state = "dark"},/area/holodeck/rec_center/chapelcourt) @@ -854,7 +854,7 @@ "goG" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel,/area/fatlab) "goJ" = (/turf/open/floor/plasteel/freezer,/area/fatlab) "goN" = (/obj/vehicle/ridden/wheelchair,/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/fatlab) -"gpc" = (/obj/item/razor{pixel_x = 2; pixel_y = 5},/obj/structure/table/glass,/turf/open/floor/mineral/basaltstone_floor,/area/centcom/ferry) +"gpc" = (/obj/item/razor{pixel_y = 5; pixel_x = -11},/obj/structure/table/glass,/turf/open/floor/mineral/basaltstone_floor,/area/centcom/ferry) "gpj" = (/obj/structure/dresser,/obj/machinery/light{dir = 1},/turf/open/floor/wood,/area/centcom/holding) "gpl" = (/obj/structure/table/wood,/obj/item/flashlight/lamp,/obj/machinery/light/small{dir = 1},/turf/open/floor/wood,/area/centcom/ferry) "gpI" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/item/folder/white,/obj/item/pen/blue,/obj/machinery/door/window/brigdoor{base_state = "rightsecure"; dir = 8; icon_state = "rightsecure"; name = "CentCom Customs"; req_access_txt = "109"},/obj/effect/turf_decal/bot,/turf/open/floor/plasteel,/area/centcom/control) @@ -2471,7 +2471,7 @@ "rEL" = (/obj/structure/flora/ausbushes/lavendergrass,/obj/structure/flora/ausbushes/sparsegrass,/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/grassybush,/obj/structure/flora/ausbushes/ppflowers,/obj/structure/flora/ausbushes/pointybush,/obj/machinery/light{dir = 1},/turf/open/floor/grass,/area/centcom/evac) "rEV" = (/obj/machinery/computer/telecrystals/uplinker,/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/mineral/plastitanium/red,/area/syndicate_mothership) "rGl" = (/obj/machinery/light/small{dir = 4},/turf/open/floor/carpet,/area/wizard_station) -"rGx" = (/obj/structure/table/wood,/obj/item/storage/box,/obj/item/tank/internals/emergency_oxygen/double,/obj/item/reagent_containers/hypospray/medipen/survival,/obj/item/reagent_containers/hypospray/medipen,/obj/item/crowbar/red,/obj/machinery/light/small{dir = 1},/turf/open/floor/plasteel/dark/side{dir = 5},/area/centcom/ferry) +"rGx" = (/obj/structure/table/wood,/obj/item/storage/box,/obj/item/tank/internals/emergency_oxygen/double,/obj/item/reagent_containers/hypospray/medipen/survival,/obj/item/reagent_containers/hypospray/medipen,/obj/item/crowbar/red,/obj/machinery/light/small{dir = 1},/obj/item/melee/classic_baton/telescopic,/turf/open/floor/plasteel/dark/side{dir = 5},/area/centcom/ferry) "rGL" = (/obj/machinery/shower{dir = 4},/obj/effect/turf_decal/tile/green{dir = 1},/obj/effect/turf_decal/tile/green{dir = 4},/obj/effect/turf_decal/tile/green{dir = 8},/turf/open/floor/plasteel/white,/area/tdome/tdomeobserve) "rGM" = (/obj/structure/table/reinforced,/obj/item/stack/packageWrap,/obj/item/crowbar/power,/obj/item/wrench,/obj/item/hand_labeler,/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/centcom/ferry) "rGR" = (/obj/structure/table/wood,/obj/item/instrument/violin,/turf/open/floor/holofloor/carpet,/area/holodeck/rec_center/lounge) diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 8b9469d3..32f84ec1 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -244,6 +244,15 @@ datum/gear/lyricalpawsring path = /obj/item/dnainjector/fatfang ckeywhitelist = list("sonoida") +/obj/item/toy/sword/chloesabre/halsey + name = "Halsey's Sabre" + desc = "An elegant weapon, similar in design to the Captain's Sabre, but with a platinum hilt and an adamantine blade. the hilt has an engraved hyena on it." + force = 16 + +/obj/item/gun/ballistic/revolver/mateba/moka + name = "\improper Custom Unica 6 revolver" + desc = "An elegant and ornate revolver belonging to a certain hellcat commander. There are some words carved on its side: 'Dura Lex, Sed Lex'" + //metha rossi you fat hog /datum/gear/wgspell_add