diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index d6825967c2..96318ff1c0 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -194,10 +194,8 @@ return /obj/item/blueprints/proc/move_turfs_to_area(var/list/turf/turfs, var/area/A) - A.contents.Add(turfs) - //oldarea.contents.Remove(usr.loc) // not needed - //T.loc = A //error: cannot change constant value - + for(var/T in turfs) + ChangeArea(T, A) /obj/item/blueprints/proc/edit_area() var/area/A = get_area() diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 8bafe40431..1b75e208ee 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -61,7 +61,7 @@ character_name = list("Xander Bevin") /datum/gear/fluff/charlotte_cigarettes - path = /obj/item/weapon/storage/fancy/cigarettes/charlotte + path = /obj/item/weapon/storage/fancy/fluff/charlotte display_name = "Charlotte's cigarette case" ckeywhitelist = list("alfalah") character_name = list("Charlotte Graves") @@ -107,6 +107,12 @@ ckeywhitelist = list("astraether") character_name = list("Astra Ether") +/datum/gear/fluff/astra_medal_2 + path = /obj/item/clothing/accessory/medal/silver/unity + display_name = "Astra's Unity Medal" + ckeywhitelist = list("astraether") + character_name = list("Astra Ether") + /datum/gear/fluff/collar/azura path = /obj/item/clothing/accessory/collar/azura display_name = "collar, Azura" diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index 85c2804758..5422e294b4 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -365,4 +365,4 @@ icon_state = "silverthree" item_state = "silverthree" overlay_state = "silverthree" - desc = "A silver medal awarded to a group which has demonstrated exceptional teamwork to achieve a notable feat. This one has two bronze service stars, denoting that it has been awarded three times." + desc = "A silver medal awarded to a group which has demonstrated exceptional teamwork to achieve a notable feat. This one has three bronze service stars, denoting that it has been awarded four times." diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 59e43ebcf9..7b475bdd37 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1362,13 +1362,13 @@ icon_state = "render" //AlFalah - Charlotte Graves -/obj/item/weapon/storage/fancy/cigarettes/charlotte +/obj/item/weapon/storage/fancy/fluff/charlotte name = "inconspicuous cigarette case" desc = "A SkyTron 3000 cigarette case with no additional functions. The buttons and CRT monitor are completely for show and have no functions. Seriously. " icon_state = "charlotte" icon = 'icons/vore/custom_items_vr.dmi' storage_slots = 7 can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/weapon/flame/lighter, /obj/item/trash/cigbutt) - icon_type = "cigarette" - brand = "\improper Professional 120" + icon_type = "charlotte" + //brand = "\improper Professional 120" starts_with = list(/obj/item/clothing/mask/smokable/cigarette = 7) \ No newline at end of file diff --git a/icons/obj/clothing/ties_vr.dmi b/icons/obj/clothing/ties_vr.dmi index b6ffe4b998..537da3aa5f 100644 Binary files a/icons/obj/clothing/ties_vr.dmi and b/icons/obj/clothing/ties_vr.dmi differ diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index e10ccc57ec..b8fe78c759 100644 Binary files a/icons/vore/custom_items_vr.dmi and b/icons/vore/custom_items_vr.dmi differ diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 3617d739da..9717e5f4f0 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -579,12 +579,12 @@ /turf/simulated/floor, /area/maintenance/cargo) "abj" = ( -/obj/structure/catwalk, -/obj/machinery/light/small{ +/obj/machinery/atmospherics/unary/engine{ dir = 1 }, -/turf/simulated/floor, -/area/maintenance/station/ai) +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/excursion/general) "abk" = ( /obj/structure/railing, /obj/machinery/light/small{ @@ -3503,12 +3503,13 @@ /turf/simulated/floor/tiled/white, /area/security/security_bathroom) "agr" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_l" }, -/turf/space, +/turf/simulated/floor/tiled/asteroid_steel/airless, /turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/excursion/general) +/area/shuttle/mining_outpost/shuttle) "ags" = ( /obj/machinery/light/small{ dir = 8 @@ -3530,21 +3531,13 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) "agu" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_l" - }, -/turf/simulated/floor/tiled/asteroid_steel/airless, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/mining_outpost/shuttle) -"agv" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8 }, /turf/simulated/floor/tiled/asteroid_steel/airless, /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/mining_outpost/shuttle) -"agw" = ( +"agv" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion_r" @@ -36165,7 +36158,7 @@ aUJ aXb afT aez -agr +abj ams aXq abe @@ -36307,7 +36300,7 @@ wRt eug afT aeG -agr +abj ams aXq abe @@ -37443,7 +37436,7 @@ ikk efQ wPF aeG -agr +abj ams aSx krj @@ -37585,7 +37578,7 @@ iEV tEV xiw aeH -agr +abj ams eAm abe @@ -37878,7 +37871,7 @@ abe abe adV aSi -abj +aib aib aib agJ @@ -39622,11 +39615,11 @@ avt avt adD aZS +agr +agu +agu agu agv -agv -agv -agw baB adD avt