cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-07-18 03:02:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into economy-update-junk

Browse Source
This commit is contained in:
Dahlular
2022-07-06 16:28:45 -06:00
committed by GitHub
parent 7b9f638832 0584d6b79a
commit c7c6e2d193
196 changed files with 865 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/game/gamemodes/gangs/dominator.dm
+1 -2
View File
@@ -192,8 +192,7 @@
countdown.start()
countdown.color = gang.color
set_light(l_range = 3, l_power = 0.9)
light_color = gang.color
set_light(l_range = 3, l_power = 0.9, l_color=gang.color)
START_PROCESSING(SSmachines, src)
gang.message_gangtools("Hostile takeover in progress: Estimated [time] minutes until victory.[gang.dom_attempts ? "" : " This is your final attempt."]")
modular_citadel/code/game/gamemodes/gangs/gang_datums.dm
+13 -13
View File
@@ -8,13 +8,13 @@
/datum/team/gang/clandestine
name = "Clandestine"
color = "#FF0000"
color = COLOR_RED
inner_outfits = list(/obj/item/clothing/under/syndicate/combat)
outer_outfits = list(/obj/item/clothing/suit/jacket)
/datum/team/gang/prima
name = "Prima"
color = "#FFFF00"
color = COLOR_YELLOW
inner_outfits = list(/obj/item/clothing/under/color/yellow)
outer_outfits = list(/obj/item/clothing/suit/hastur)
@@ -26,31 +26,31 @@
/datum/team/gang/max
name = "Max"
color = "#800000"
color = COLOR_RED
inner_outfits = list(/obj/item/clothing/under/color/maroon)
outer_outfits = list(/obj/item/clothing/suit/poncho/red)
/datum/team/gang/blasto
name = "Blasto"
color = "#000080"
color = COLOR_NAVY
inner_outfits = list(/obj/item/clothing/under/suit_jacket/navy)
outer_outfits = list(/obj/item/clothing/suit/jacket/miljacket)
/datum/team/gang/waffle
name = "Waffle"
color = "#808000" //shared color with cyber, but they can keep brown cause waffles.
color = COLOR_OLIVE //shared color with cyber, but they can keep brown cause waffles.
inner_outfits = list(/obj/item/clothing/under/suit_jacket/green)
outer_outfits = list(/obj/item/clothing/suit/poncho)
/datum/team/gang/north
name = "North"
color = "#00FF00"
color = COLOR_GREEN
inner_outfits = list(/obj/item/clothing/under/color/green)
outer_outfits = list(/obj/item/clothing/suit/poncho/green)
/datum/team/gang/omni
name = "Omni"
color = "#008080"
color = COLOR_TEAL
inner_outfits = list(/obj/item/clothing/under/color/teal)
outer_outfits = list(/obj/item/clothing/suit/studentuni)
@@ -68,13 +68,13 @@
/datum/team/gang/donk
name = "Donk"
color = "#0000FF"
color = COLOR_BLUE
inner_outfits = list(/obj/item/clothing/under/color/darkblue)
outer_outfits = list(/obj/item/clothing/suit/apron/overalls)
/datum/team/gang/gene
name = "Gene"
color = "#00FFFF"
color = COLOR_CYAN
inner_outfits = list(/obj/item/clothing/under/color/blue)
outer_outfits = list(/obj/item/clothing/suit/apron)
@@ -86,13 +86,13 @@
/datum/team/gang/tunnel
name = "Tunnel"
color = "#FF00FF" //Gave the leather jacket to the tunnel gang over diablo.
color = COLOR_MAGENTA //Gave the leather jacket to the tunnel gang over diablo.
inner_outfits = list(/obj/item/clothing/under/villain)
outer_outfits = list(/obj/item/clothing/suit/jacket/leather)
/datum/team/gang/diablo
name = "Diablo"
color = "#FF0000" //literal early 90s skinhead regalia.
color = COLOR_RED //literal early 90s skinhead regalia.
inner_outfits = list(/obj/item/clothing/under/pants/classicjeans)
outer_outfits = list(/obj/item/clothing/suit/suspenders)
@@ -110,13 +110,13 @@
/datum/team/gang/sirius
name = "Sirius"
color = "#FFC0CB"
color = COLOR_PINK
inner_outfits = list(/obj/item/clothing/under/color/pink)
outer_outfits = list(/obj/item/clothing/suit/jacket/puffer/vest)
/datum/team/gang/sleepingcarp
name = "Sleeping Carp"
color = "#800080"
color = COLOR_PURPLE
inner_outfits = list(/obj/item/clothing/under/color/lightpurple)
outer_outfits = list(/obj/item/clothing/suit/hooded/carp_costume)
modular_citadel/code/game/objects/items/melee/eutactic_blades.dm
+4 -4
View File
@@ -96,7 +96,7 @@
if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes")
var/energy_color_input = input(usr,"","Choose Energy Color",light_color) as color|null
if(energy_color_input)
light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
set_light_color(sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1))
update_icon()
update_light()
@@ -205,7 +205,7 @@
if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes")
var/energy_color_input = input(usr,"","Choose Energy Color",light_color) as color|null
if(energy_color_input)
light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
set_light_color(sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1))
update_icon()
update_light()
@@ -257,7 +257,7 @@
slowdown_wielded = 1
armour_penetration = 60
light_color = "#37FFF7"
rainbow_colors = list("#FF0000", "#FFFF00", "#00FF00", "#00FFFF", "#0000FF","#FF00FF", "#3399ff", "#ff9900", "#fb008b", "#9800ff", "#00ffa3", "#ccff00")
rainbow_colors = list(COLOR_RED, COLOR_YELLOW, COLOR_GREEN, COLOR_CYAN, COLOR_BLUE,COLOR_MAGENTA, "#3399ff", COLOR_ORANGE, "#fb008b", "#9800ff", "#00ffa3", "#ccff00")
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "destroyed", "ripped", "devastated", "shredded")
spinnable = FALSE
total_mass_on = 4
@@ -319,7 +319,7 @@
var/energy_color_input = input(usr,"","Choose Energy Color",light_color) as color|null
if(!energy_color_input || !user.canUseTopic(src, BE_CLOSE, FALSE) || hacked)
return
light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
set_light_color(sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1))
update_icon()
update_light()
modular_citadel/code/modules/awaymissions/citadel_ghostrole_spawners.dm
+1 -1
View File
@@ -43,7 +43,7 @@
var/obj/item/card/id/knight/W = H.wear_id
W.assignment = "Knight"
W.registered_name = H.real_name
W.id_color = "#0000FF" //Regular knights get simple blue. Doesn't matter much because it's variable anyway
W.id_color = COLOR_BLUE //Regular knights get simple blue. Doesn't matter much because it's variable anyway
W.update_label(H.real_name)
W.update_icon()
modular_citadel/code/modules/projectiles/ammunition/caseless.dm
+3 -3
View File
@@ -1,13 +1,13 @@
/obj/item/ammo_casing/caseless/foam_dart/tag
name = "lastag foam dart"
desc = "Foam darts fitted with special lights. Compatible with existing laser tag systems. Ages 8 and up."
color = "#FF00FF"
color = COLOR_MAGENTA
projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/tag
/obj/item/ammo_casing/caseless/foam_dart/tag/red
name = "lastag red foam dart"
color = "#FF0000"
color = COLOR_RED
projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/tag/red
/obj/item/ammo_casing/caseless/foam_dart/tag/blue
name = "lastag blue foam dart"
color = "#0000FF"
color = COLOR_BLUE
projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/tag/blue
modular_citadel/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
+3 -3
View File
@@ -4,7 +4,7 @@
icon_state = "foambox"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/tag
max_ammo = 40
color = "#FF00FF"
color = COLOR_MAGENTA
/obj/item/ammo_box/foambox/tag/red
name = "ammo box (Lastag Red Foam Darts)"
@@ -12,7 +12,7 @@
icon_state = "foambox"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/tag/red
max_ammo = 40
color = "#FF0000"
color = COLOR_RED
/obj/item/ammo_box/foambox/tag/blue
name = "ammo box (Lastag Blue Foam Darts)"
@@ -20,4 +20,4 @@
icon_state = "foambox"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/tag/blue
max_ammo = 40
color = "#0000FF"
color = COLOR_BLUE
modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm
+3 -3
View File
@@ -50,7 +50,7 @@
light_range = 2
speed = 0.6
range = 25
light_color = LIGHT_COLOR_RED
light_color = COLOR_SOFT_RED
/obj/item/projectile/bullet/nlmags //non-lethal boolets
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
@@ -204,7 +204,7 @@
light_range = 3
speed = 0.6
range = 35
light_color = LIGHT_COLOR_RED
light_color = COLOR_SOFT_RED
/obj/item/projectile/bullet/nlmagrifle //non-lethal boolets
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
@@ -358,7 +358,7 @@
forcedodge = TRUE
range = 6
light_range = 1
light_color = LIGHT_COLOR_RED
light_color = COLOR_SOFT_RED
/obj/item/projectile/bullet/mags/hyper/inferno
icon_state = "magjectile-large"
modular_citadel/code/modules/projectiles/projectiles/reusable.dm
+2 -2
View File
@@ -12,11 +12,11 @@
/obj/item/projectile/bullet/reusable/foam_dart/tag/red
name = "lastag red foam dart"
color = "#FF0000"
color = COLOR_RED
suit_types = list(/obj/item/clothing/suit/bluetag)
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/tag/red
/obj/item/projectile/bullet/reusable/foam_dart/tag/blue
color = "#0000FF"
color = COLOR_BLUE
name = "lastag blue foam dart"
suit_types = list(/obj/item/clothing/suit/redtag)
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/tag/blue
modular_citadel/code/modules/vore/resizing/sizechemicals.dm
+3 -3
View File
@@ -7,7 +7,7 @@
name = "Macrocillin"
description = "Glowing yellow liquid."
reagent_state = LIQUID
color = "#FFFF00" // rgb: 255, 255, 0
color = COLOR_YELLOW // rgb: 255, 255, 0
overdose_threshold = 20
/datum/reagent/medicine/macrocillin/on_mob_life(mob/living/M, method=INGEST)
@@ -24,7 +24,7 @@
name = "Microcillin"
description = "Murky purple liquid."
reagent_state = LIQUID
color = "#800080"
color = COLOR_PURPLE
overdose_threshold = 20
/datum/reagent/microcillin/on_mob_life(mob/living/M, method=INGEST)
@@ -42,7 +42,7 @@
name = "Normalcillin"
description = "Translucent cyan liquid."
reagent_state = LIQUID
color = "#00FFFF"
color = COLOR_CYAN
overdose_threshold = 20
/datum/reagent/medicine/normalcillin/on_mob_life(mob/living/M, method=INGEST)