diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm.rej b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm.rej new file mode 100644 index 0000000000..4ba00d1798 --- /dev/null +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm.rej @@ -0,0 +1,10 @@ +diff a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm (rejected hunks) +@@ -213,7 +213,7 @@ + "ee" = (/obj/machinery/door/airlock/highsecurity{name = "Secure Storage"; req_access_txt = "200"},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) + "ef" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 10},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) + "eg" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +-"eh" = (/obj/structure/table,/obj/item/weapon/storage/backpack/dufflebag/sec{contents = newlist(/obj/item/weapon/scalpel,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/cautery,/obj/item/weapon/circular_saw,/obj/item/weapon/surgical_drapes,/obj/item/clothing/mask/surgical); desc = "A large duffle bag for holding extra supplies - this one has a material inlay with space for various sharp-looking tools."; name = "duffle bag"; pixel_y = 5},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{cell_type = 5000; dir = 4; name = "Armory APC"; pixel_x = 24; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) ++"eh" = (/obj/structure/table,/obj/item/weapon/storage/backpack/dufflebag/sec{contents = newlist(/obj/item/weapon/scalpel,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/cautery,/obj/item/weapon/circular_saw,/obj/item/weapon/surgical_drapes,/obj/item/clothing/mask/surgical); desc = "A large dufflebag for holding extra supplies - this one has a material inlay with space for various sharp-looking tools."; name = "dufflebag"; pixel_y = 5},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{cell_type = 5000; dir = 4; name = "Armory APC"; pixel_x = 24; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) + "ei" = (/obj/structure/dresser,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) + "ej" = (/obj/structure/table/wood,/obj/item/device/flashlight/lamp,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) + "ek" = (/obj/structure/bed,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/weapon/bedsheet,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index bb41c82ddb..e3f1b01590 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -43,11 +43,11 @@ GLOBAL_LIST_INIT(security_depts_prefs, list(SEC_DEPT_RANDOM, SEC_DEPT_NONE, SEC_ //Backpacks #define GBACKPACK "Grey Backpack" #define GSATCHEL "Grey Satchel" -#define GDUFFLEBAG "Grey Dufflebag" +#define GDUFFLEBAG "Grey Dufflebag" #define LSATCHEL "Leather Satchel" #define DBACKPACK "Department Backpack" #define DSATCHEL "Department Satchel" -#define DDUFFLEBAG "Department Dufflebag" +#define DDUFFLEBAG "Department Dufflebag" GLOBAL_LIST_INIT(backbaglist, list(DBACKPACK, DSATCHEL, DDUFFLEBAG, GBACKPACK, GSATCHEL, GDUFFLEBAG, LSATCHEL)) //Uplink spawn loc diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index ed502e17cd..f625766932 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -317,42 +317,42 @@ revealed = 1 /obj/item/weapon/storage/backpack/dufflebag - name = "dufflebag" - desc = "A large dufflebag for holding extra things." + name = "dufflebag" + desc = "A large dufflebag for holding extra things." icon_state = "duffle" item_state = "duffle" slowdown = 1 max_combined_w_class = 30 /obj/item/weapon/storage/backpack/dufflebag/captain - name = "captain's dufflebag" - desc = "A large dufflebag for holding extra captainly goods." + name = "captain's dufflebag" + desc = "A large dufflebag for holding extra captainly goods." icon_state = "duffle-captain" item_state = "duffle-captain" resistance_flags = 0 /obj/item/weapon/storage/backpack/dufflebag/med - name = "medical dufflebag" - desc = "A large dufflebag for holding extra medical supplies." + name = "medical dufflebag" + desc = "A large dufflebag for holding extra medical supplies." icon_state = "duffle-med" item_state = "duffle-med" /obj/item/weapon/storage/backpack/dufflebag/sec - name = "security dufflebag" - desc = "A large dufflebag for holding extra security supplies and ammunition." + name = "security dufflebag" + desc = "A large dufflebag for holding extra security supplies and ammunition." icon_state = "duffle-sec" item_state = "duffle-sec" /obj/item/weapon/storage/backpack/dufflebag/engineering - name = "industrial dufflebag" - desc = "A large dufflebag for holding extra tools and supplies." + name = "industrial dufflebag" + desc = "A large dufflebag for holding extra tools and supplies." icon_state = "duffle-eng" item_state = "duffle-eng" resistance_flags = 0 /obj/item/weapon/storage/backpack/dufflebag/drone - name = "drone dufflebag" - desc = "A large dufflebag for holding tools and hats." + name = "drone dufflebag" + desc = "A large dufflebag for holding tools and hats." icon_state = "duffle-drone" item_state = "duffle-drone" resistance_flags = FIRE_PROOF @@ -367,8 +367,8 @@ new /obj/item/device/multitool(src) /obj/item/weapon/storage/backpack/dufflebag/clown - name = "clown's dufflebag" - desc = "A large dufflebag for holding lots of funny gags!" + name = "clown's dufflebag" + desc = "A large dufflebag for holding lots of funny gags!" icon_state = "duffle-clown" item_state = "duffle-clown" @@ -377,8 +377,8 @@ new /obj/item/weapon/reagent_containers/food/snacks/pie/cream(src) /obj/item/weapon/storage/backpack/dufflebag/syndie - name = "suspicious looking dufflebag" - desc = "A large dufflebag for holding extra tactical supplies." + name = "suspicious looking dufflebag" + desc = "A large dufflebag for holding extra tactical supplies." icon_state = "duffle-syndie" item_state = "duffle-syndie" origin_tech = "syndicate=1" @@ -386,14 +386,14 @@ slowdown = 0 /obj/item/weapon/storage/backpack/dufflebag/syndie/med - name = "medical dufflebag" - desc = "A large dufflebag for holding extra tactical medical supplies." + name = "medical dufflebag" + desc = "A large dufflebag for holding extra tactical medical supplies." icon_state = "duffle-syndiemed" item_state = "duffle-syndiemed" /obj/item/weapon/storage/backpack/dufflebag/syndie/surgery - name = "surgery dufflebag" - desc = "A suspicious looking dufflebag for holding surgery tools." + name = "surgery dufflebag" + desc = "A suspicious looking dufflebag for holding surgery tools." icon_state = "duffle-syndiemed" item_state = "duffle-syndiemed" @@ -410,13 +410,13 @@ new /obj/item/device/mmi/syndie(src) /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo - name = "ammunition dufflebag" - desc = "A large dufflebag for holding extra weapons ammunition and supplies." + name = "ammunition dufflebag" + desc = "A large dufflebag for holding extra weapons ammunition and supplies." icon_state = "duffle-syndieammo" item_state = "duffle-syndieammo" /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/shotgun - desc = "A large dufflebag, packed to the brim with Bulldog shotgun ammo." + desc = "A large dufflebag, packed to the brim with Bulldog shotgun ammo." /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/shotgun/PopulateContents() for(var/i in 1 to 6) @@ -426,14 +426,14 @@ new /obj/item/ammo_box/magazine/m12g/dragon(src) /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/smg - desc = "A large dufflebag, packed to the brim with C20r magazines." + desc = "A large dufflebag, packed to the brim with C20r magazines." /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/smg/PopulateContents() for(var/i in 1 to 9) new /obj/item/ammo_box/magazine/smgm45(src) /obj/item/weapon/storage/backpack/dufflebag/syndie/c20rbundle - desc = "A large dufflebag containing a C20r, some magazines, and a cheap looking suppressor." + desc = "A large dufflebag containing a C20r, some magazines, and a cheap looking suppressor." /obj/item/weapon/storage/backpack/dufflebag/syndie/c20rbundle/PopulateContents() new /obj/item/ammo_box/magazine/smgm45(src) @@ -442,7 +442,7 @@ new /obj/item/weapon/suppressor/specialoffer(src) /obj/item/weapon/storage/backpack/dufflebag/syndie/bulldogbundle - desc = "A large dufflebag containing a Bulldog, several drums, and a collapsed hardsuit." + desc = "A large dufflebag containing a Bulldog, several drums, and a collapsed hardsuit." /obj/item/weapon/storage/backpack/dufflebag/syndie/bulldogbundle/PopulateContents() new /obj/item/ammo_box/magazine/m12g(src) @@ -451,7 +451,7 @@ new /obj/item/clothing/glasses/thermal/syndi(src) /obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle - desc = "A large dufflebag containing a medical equipment, a Donksoft machine gun, a big jumbo box of darts, and a knock-off pair of magboots." + desc = "A large dufflebag containing a medical equipment, a Donksoft machine gun, a big jumbo box of darts, and a knock-off pair of magboots." /obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle/PopulateContents() new /obj/item/clothing/shoes/magboots/syndie(src) @@ -460,7 +460,7 @@ new /obj/item/ammo_box/foambox/riot(src) /obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle - desc = "A large dufflebag containing a medical equipment, a Donksoft machine gun, a big jumbo box of darts, and a knock-off pair of magboots." + desc = "A large dufflebag containing a medical equipment, a Donksoft machine gun, a big jumbo box of darts, and a knock-off pair of magboots." /obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle/PopulateContents() new /obj/item/clothing/shoes/magboots/syndie(src) @@ -469,7 +469,7 @@ new /obj/item/ammo_box/foambox/riot(src) /obj/item/weapon/storage/backpack/dufflebag/syndie/med/bioterrorbundle - desc = "A large dufflebag containing a deadly chemicals, a chemical spray, chemical grenade, a Donksoft assault rifle, riot grade darts, a minature syringe gun, and a box of syringes" + desc = "A large dufflebag containing a deadly chemicals, a chemical spray, chemical grenade, a Donksoft assault rifle, riot grade darts, a minature syringe gun, and a box of syringes" /obj/item/weapon/storage/backpack/dufflebag/syndie/med/bioterrorbundle/PopulateContents() new /obj/item/weapon/reagent_containers/spray/chemsprayer/bioterror(src) @@ -489,7 +489,7 @@ new /obj/item/weapon/grenade/plastic/x4(src) /obj/item/weapon/storage/backpack/dufflebag/syndie/firestarter - desc = "A large dufflebag containing New Russian pyro backpack sprayer, a pistol, a pipebomb, fireproof hardsuit, ammo, and other equipment." + desc = "A large dufflebag containing New Russian pyro backpack sprayer, a pistol, a pipebomb, fireproof hardsuit, ammo, and other equipment." /obj/item/weapon/storage/backpack/dufflebag/syndie/firestarter/PopulateContents() new /obj/item/clothing/under/syndicate/soviet(src) diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index 6c638739ae..2cce33926d 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -164,7 +164,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/nukeoffer/sniper name = "Sniper bundle" - desc = "Elegant and refined: Contains a collapsed sniper rifle in an expensive carrying case, a hollowpoint \ + desc = "Elegant and refined: Contains a collapsed sniper rifle in an expensive carrying case, a hollow-point \ haemorrhage magazine, a soporific knockout magazine, a free surplus supressor, and a worn out suit and tie." item = /obj/item/weapon/storage/briefcase/sniperbundle cost = 20 // normally 26 @@ -202,7 +202,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/dangerous/shotgun name = "Bulldog Shotgun" - desc = "A fully-loaded semi-automatic drum-fed shotgun. Compatiable with all 12g rounds. Designed for close \ + desc = "A fully-loaded semi-automatic drum-fed shotgun. Compatible with all 12g rounds. Designed for close \ quarter anti-personnel engagements." item = /obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog cost = 8 @@ -241,7 +241,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/dangerous/sniper name = "Sniper Rifle" - desc = "Ranged fury, Syndicate style. guaranteed to cause shock and awe or your TC back!" + desc = "Ranged fury, Syndicate style. Guaranteed to cause shock and awe or your TC back!" item = /obj/item/weapon/gun/ballistic/automatic/sniper_rifle/syndicate cost = 16 surplus = 25 @@ -260,7 +260,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. fit into a pocket or slip into a bag unnoticed. It will synthesize \ and fire bolts tipped with a paralyzing toxin that will briefly stun \ targets and cause them to slur as if inebriated. It can produce an \ - infinite amount of bolts, but takes time to automatically recharge \ + infinite number of bolts, but takes time to automatically recharge \ after each shot." item = /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow cost = 12 @@ -455,22 +455,22 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. include_modes = list(/datum/game_mode/nuclear) /datum/uplink_item/ammo/shotgun/bag - name = "12g Ammo Duffelbag" - desc = "A duffelbag filled with enough 12g ammo to supply an entire team, at a discounted price." + name = "12g Ammo Dufflebag" + desc = "A dufflebag filled with enough 12g ammo to supply an entire team, at a discounted price." item = /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/shotgun cost = 12 /datum/uplink_item/ammo/smg name = ".45 SMG Magazine" - desc = "An additional 20-round .45 magazine sutable for use with the C-20r submachine gun. \ + desc = "An additional 20-round .45 magazine suitable for use with the C-20r submachine gun. \ These bullets pack a lot of punch that can knock most targets down, but do limited overall damage." item = /obj/item/ammo_box/magazine/smgm45 cost = 3 include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/gang) /datum/uplink_item/ammo/smg/bag - name = ".45 Ammo Duffelbag" - desc = "A duffelbag filled with enough .45 ammo to supply an entire team, at a discounted price." + name = ".45 Ammo Dufflebag" + desc = "A dufflebag filled with enough .45 ammo to supply an entire team, at a discounted price." item = /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/smg cost = 20 include_modes = list(/datum/game_mode/nuclear) @@ -591,7 +591,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/support/mauler name = "Mauler Exosuit" - desc = "A massive and incredibly deadly military-grade exosuit. Features long-range targetting, thrust vectoring, \ + desc = "A massive and incredibly deadly military-grade exosuit. Features long-range targeting, thrust vectoring, \ and deployable smoke." item = /obj/mecha/combat/marauder/mauler/loaded cost = 140 @@ -865,7 +865,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/suits/hardsuit/elite name = "Elite Syndicate Hardsuit" - desc = "An advanced hardsuit with superior armor and mobility to the standard Syndicate Hardsuit." + desc = "An advanced hardsuit with superior armor and mobility to the standard Syndicate hardsuit." item = /obj/item/clothing/suit/space/hardsuit/syndi/elite cost = 8 include_modes = list(/datum/game_mode/nuclear) @@ -932,7 +932,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/device_tools/thermal name = "Thermal Imaging Glasses" - desc = "These goggles can be turned to resemble common eyewears throughout the station. \ + desc = "These goggles can be turned to resemble common eyewear found throughout the station. \ They allow you to see organisms through walls by capturing the upper portion of the infrared light spectrum, \ emitted as heat and light by objects. Hotter objects, such as warm bodies, cybernetic organisms \ and artificial intelligence cores emit more of this light than cooler objects like walls and airlocks." @@ -1068,7 +1068,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. cost = 3 /datum/uplink_item/device_tools/assault_pod - name = "Assault Pod Targetting Device" + name = "Assault Pod Targeting Device" desc = "Use to select the landing zone of your assault pod." item = /obj/item/device/assault_pod cost = 30 @@ -1345,8 +1345,8 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/badass/bundle name = "Syndicate Bundle" - desc = "Syndicate Bundles are specialised groups of items that arrive in a plain box. \ - These items are collectively worth more than 20 telecrystals, but you do not know which specialisation \ + desc = "Syndicate Bundles are specialized groups of items that arrive in a plain box. \ + These items are collectively worth more than 20 telecrystals, but you do not know which specialization \ you will receive." item = /obj/item/weapon/storage/box/syndicate cost = 20