cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes polychrome (#17115)

Browse Source 
* remove polychromic remnants

* Update modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm

* Update modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm
This commit is contained in:
Tom
2022-10-25 18:15:27 -04:00
committed by GitHub
parent 889888a418
commit 44a7cbcfa8
8 changed files with 57 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/skyrat/polychromicfacility.dmm → _maps/RandomRuins/SpaceRuins/skyrat/clothing_facility.dmm
+49 -49
View File
@@ -4,30 +4,30 @@
/area/template_noop)
"b" = (
/turf/open/floor/plating,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"c" = (
/turf/closed/mineral/random,
/area/ruin/unpowered/no_grav)
"d" = (
/obj/machinery/destructive_scanner,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"e" = (
/turf/closed/wall,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"f" = (
/turf/closed/wall/r_wall,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"g" = (
/turf/open/floor/iron/dark/side,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"h" = (
/obj/structure/toilet{
pixel_y = 12
},
/obj/machinery/light/directional/east,
/turf/open/floor/iron/showroomfloor,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"i" = (
/obj/structure/chair/sofa/bench/left{
dir = 4
@@ -36,26 +36,26 @@
dir = 4
},
/turf/open/floor/wood,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"j" = (
/turf/open/floor/engine,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"k" = (
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/turf/open/floor/wood,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"l" = (
/turf/open/floor/iron/dark/side{
dir = 8
},
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"m" = (
/obj/machinery/light/directional/north,
/turf/open/floor/engine,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"n" = (
/obj/item/card/id/advanced/colourable{
pixel_y = 6
@@ -66,11 +66,11 @@
},
/obj/item/card/id/advanced/colourable,
/turf/open/floor/engine,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"o" = (
/obj/structure/sink/directional/south,
/turf/open/floor/iron/showroomfloor,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"p" = (
/obj/structure/chair/sofa/bench/right{
dir = 4
@@ -79,14 +79,14 @@
dir = 4
},
/turf/open/floor/wood,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"q" = (
/obj/item/clothing/neck/cloak/colourable/veil,
/obj/structure/rack,
/obj/item/clothing/neck/cloak/colourable/veil,
/obj/item/clothing/neck/cloak/colourable/veil,
/turf/open/floor/engine,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"r" = (
/obj/structure/chair/sofa/bench/right{
dir = 8
@@ -95,88 +95,88 @@
dir = 8
},
/turf/open/floor/wood,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"s" = (
/obj/machinery/autolathe,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"t" = (
/obj/structure/window/reinforced/spawner,
/turf/open/floor/engine,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"u" = (
/obj/machinery/door/window/left/directional/south,
/turf/open/floor/engine,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"v" = (
/obj/machinery/light/directional/west,
/obj/machinery/rnd/destructive_analyzer,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"w" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"x" = (
/turf/open/floor/iron/dark/corner{
dir = 1
},
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"y" = (
/turf/open/floor/iron/dark/corner,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"z" = (
/turf/open/floor/iron/showroomfloor,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"A" = (
/obj/machinery/door/airlock,
/turf/open/floor/iron/showroomfloor,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"B" = (
/obj/machinery/door/airlock/research,
/turf/open/floor/iron,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"C" = (
/turf/open/floor/iron/dark/corner{
dir = 8
},
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"D" = (
/obj/machinery/light/directional/south,
/obj/structure/toilet{
dir = 8
},
/turf/open/floor/iron/showroomfloor,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"E" = (
/obj/structure/window/reinforced/spawner/east,
/turf/open/floor/engine,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"F" = (
/obj/machinery/door/window/right/directional/west,
/turf/open/floor/engine,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"G" = (
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"H" = (
/turf/open/floor/iron/bluespace,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"I" = (
/obj/structure/window/reinforced/spawner/west,
/turf/open/floor/engine,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"J" = (
/turf/open/floor/iron/dark/side{
dir = 4
},
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"K" = (
/obj/machinery/light/directional/east,
/turf/open/floor/iron/dark/corner{
dir = 8
},
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"L" = (
/obj/structure/chair/sofa/bench/left{
dir = 8
@@ -185,68 +185,68 @@
dir = 8
},
/turf/open/floor/wood,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"M" = (
/obj/machinery/door/airlock/highsecurity,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"N" = (
/obj/machinery/light/directional/east,
/turf/open/floor/engine,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"O" = (
/turf/open/floor/iron/dark/corner{
dir = 4
},
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"P" = (
/turf/open/floor/iron/dark/side{
dir = 1
},
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"Q" = (
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/turf/open/floor/wood,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"R" = (
/obj/machinery/light/directional/west,
/turf/open/floor/engine,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"S" = (
/turf/open/floor/iron,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"T" = (
/obj/structure/rack,
/obj/item/clothing/neck/cloak/colourable/shroud,
/obj/item/clothing/neck/cloak/colourable/shroud,
/obj/item/clothing/neck/cloak/colourable/shroud,
/turf/open/floor/engine,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"U" = (
/obj/structure/sink/directional/east,
/turf/open/floor/iron/showroomfloor,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"V" = (
/obj/structure/statue/plasma/scientist,
/turf/open/floor/iron/bluespace,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"W" = (
/obj/machinery/door/window/right/directional/east,
/turf/open/floor/engine,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"Y" = (
/obj/machinery/light/directional/east,
/turf/open/floor/iron/dark/side{
dir = 8
},
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
"Z" = (
/obj/machinery/door/airlock/external,
/turf/open/floor/plating,
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility)
/area/ruin/space/has_grav/powered/skyrat/clothing_facility)
(1,1,1) = {"
a
modular_skyrat/modules/customization/__DEFINES/loadout.dm
-2
View File
@@ -58,5 +58,3 @@
#define LOADOUT_INFO_STYLE 1
//Stores a single color for use by the loadout datum
#define LOADOUT_INFO_ONE_COLOR 2
//Stores three colors! Good for polychromatic stuff
#define LOADOUT_INFO_THREE_COLORS 3
modular_skyrat/modules/customization/datums/elements/polychromic.dm
-57
View File
@@ -1,57 +0,0 @@
/**
* Polychromic element
*
* Add this to an R/G/B matrixed clothing to make it triple coloured and customizable!
* Make sure the passed list is a list of three, 3-length colours without a hash i.e. list("FFF","EEE","621").
*/
/datum/element/polychromic
element_flags = ELEMENT_BESPOKE
id_arg_index = 3
/datum/element/polychromic/Attach(datum/target, list/colors)
. = ..()
if(QDELETED(target))
qdel(src)
return
var/obj/item/our_thing = target
var/list/finished_list = list()
for(var/read_color in 1 to colors.len)
finished_list += ReadRGB("[colors[read_color]]00")
var/remaining_count = 3 - length(colors)
if(remaining_count > 0)
for(var/remaining_color in 1 to remaining_count)
finished_list += ReadRGB("FFF0")
finished_list += list(0,0,0,255)
for(var/index in 1 to finished_list.len)
finished_list[index] /= 255
our_thing.color = finished_list
if(!our_thing.actions_types)
our_thing.actions_types = list()
our_thing.actions_types += /datum/action/item_action/polychromic_change
/datum/action/item_action/polychromic_change
name = "Change Colours"
/datum/action/item_action/polychromic_change/Trigger(trigger_flags)
var/obj/item/item_target = target
if(!length(item_target.color)) //Something happened to our color and its no longer a matrix, uh oh
return ..()
var/list/choices = list("Primary" = 0, "Secondary" = 1, "Tertiary" = 2)
var/choice = input(usr ,"Which color would you like to change?", "Polychromic") as null|anything in choices
if(choice)
var/color = input(usr, "Choose your new color:", "Polychromic") as color|null
if(color && item_target && in_range(item_target, usr))
var/list/color_list = ReadRGB(color)
for(var/index in 1 to color_list.len)
color_list[index] /= 255
var/shift = (choices[choice] * 4)
//Due to .color not being a list variable, but being a list
//..and also being a native byond thing, we have to do this silly thing
var/list/item_target_color_list = item_target.color
var/list/new_list = item_target_color_list.Copy()
for(var/i in 1 to 3)
new_list[(i+shift)] = color_list[i]
item_target.color = new_list
item_target.update_slot_icon()
..()
modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm
+2 -2
View File
@@ -355,8 +355,8 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su
name = "Falls Parka"
item_path = /obj/item/clothing/suit/fallsparka
/datum/loadout_item/suit/poly
name = "Polychromic Wintercoat"
/datum/loadout_item/suit/gags_wintercoat
name = "Recolorable Winter Coat"
item_path = /obj/item/clothing/suit/hooded/wintercoat/colourable
/datum/loadout_item/suit/urban
modular_skyrat/modules/mapping/code/areas/space.dm
+1 -1
View File
@@ -14,7 +14,7 @@
/area/ruin/space/has_grav/powered/skyrat/smugglies
name = "Suspicious Cargo Installation"
/area/ruin/space/has_grav/powered/skyrat/polychromicfacility
/area/ruin/space/has_grav/powered/skyrat/clothing_facility
name = "Abandoned Research Station"
/area/ruin/space/has_grav/powered/skyrat/luna
modular_skyrat/modules/mapping/code/space.dm
+4 -4
View File
@@ -78,10 +78,10 @@
name = "Suspicious Cargo Installation"
description = "*SCREECH* RDM RDM RDM"
/datum/map_template/ruin/space/skyrat/polychromicfacility
id = "polychromicfacility"
suffix = "polychromicfacility.dmm"
name = "Abandoned Polychromic Facility"
/datum/map_template/ruin/space/skyrat/clothing_facility
id = "clothing_facility"
suffix = "clothing_facility.dmm"
name = "Abandoned Clothing Facility"
description = "A den of bad ideas. Secborgs were made here!"
/datum/map_template/ruin/space/skyrat/luna
modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm
+1 -1
View File
@@ -159,7 +159,7 @@
'modular_skyrat/modules/modular_items/lewd_items/sounds/bang6.ogg'), 100, TRUE, ignore_walls = FALSE)
/*
* POLYCHROMIC // this doesn't even use polychromism I Want To Die
* COLOUR CHANGING
*/
GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors
tgstation.dme
-1
View File
@@ -5406,7 +5406,6 @@
#include "modular_skyrat\modules\customization\datums\components\crafting\clothing.dm"
#include "modular_skyrat\modules\customization\datums\components\crafting\recipes.dm"
#include "modular_skyrat\modules\customization\datums\components\crafting\teshari_recipes.dm"
#include "modular_skyrat\modules\customization\datums\elements\polychromic.dm"
#include "modular_skyrat\modules\customization\datums\keybinding\communication.dm"
#include "modular_skyrat\modules\customization\game\objects\items\balls.dm"
#include "modular_skyrat\modules\customization\game\objects\items\conversion_kits.dm"