cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-28 07:07:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pr/623

Browse Source
This commit is contained in:
BongaTheProto
2023-05-06 18:45:19 -05:00
parent 1d9569e4f5 5116acad15
commit c72c8c145d
380 changed files with 10322 additions and 2969 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/bodybag.dm
-3
View File
@@ -20,9 +20,6 @@
if(!user.is_literate())
to_chat(user, "<span class='notice'>You scribble illegibly on [src]!</span>")
return
if(HAS_TRAIT(user, TRAIT_DUMB4CUM))
to_chat(user, "<span class='love'>You can't think of anything but cum right now.</span>")
return
var/t = stripped_input(user, "What would you like the label to be?", name, null, 53)
if(user.get_active_held_item() != I)
return
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+1
View File
@@ -34,3 +34,4 @@
new /obj/item/analyzer/hilbertsanalyzer(src)
new /obj/item/mod/construction/armor/research(src)
new /obj/item/mod/construction/armor/research(src)
code/game/objects/structures/fluff.dm
+2
View File
@@ -62,6 +62,8 @@
icon = 'icons/effects/64x64.dmi'
icon_state = "drake_statue"
pixel_x = -16
maptext_height = 64
maptext_width = 64
density = TRUE
deconstructible = FALSE
layer = EDGED_TURF_LAYER
code/game/objects/structures/mirror.dm
+2 -2
View File
@@ -184,7 +184,7 @@
var/custom_tone = input(user, "Choose your custom skin tone:", "Race change", default) as color|null
if(custom_tone)
var/temp_hsv = RGBtoHSV(new_s_tone)
if(ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3])
if(ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3] || !CONFIG_GET(flag/character_color_limits)) //SPLURT edit
to_chat(H,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
else
H.skin_tone = custom_tone
@@ -198,7 +198,7 @@
if(new_mutantcolor)
var/temp_hsv = RGBtoHSV(new_mutantcolor)
if(ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3]) // mutantcolors must be bright
if(ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3] || !CONFIG_GET(flag/character_color_limits)) // mutantcolors must be bright //SPLURT edit
H.dna.features["mcolor"] = sanitize_hexcolor(new_mutantcolor)
else
code/game/objects/structures/morgue.dm
-3
View File
@@ -85,9 +85,6 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an
if(!user.is_literate())
to_chat(user, "<span class='notice'>You scribble illegibly on the side of [src]!</span>")
return
if(HAS_TRAIT(user, TRAIT_DUMB4CUM))
to_chat(user, "<span class='love'>You can't think of anything but cum right now.</span>")
return
var/t = stripped_input(user, "What would you like the label to be?", text("[]", name), null)
if (user.get_active_held_item() != P)
return
code/game/objects/structures/reflector.dm
+4
View File
@@ -263,3 +263,7 @@
return
else
return ..()
/obj/structure/reflector/shuttleRotate(rotation, params)
. = ..()
setAngle(SIMPLIFY_DEGREES(rotation_angle + rotation))