shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #29 from sheepishgoat/mapping-tweaks

Browse Source 
mappin tweaks & more
This commit is contained in:
evilew
2024-11-23 02:24:39 +01:00
committed by GitHub
parent 9d7f14842c cffa8f3be4
commit 5f2cefdf36
122 changed files with 207567 additions and 201109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/citadel_defines.dm
+4 -4
View File
@@ -46,10 +46,10 @@
#define DEF_BALLS_SHAPE "Single"
#define BALLS_SIZE_MIN 1
#define BALLS_SIZE_DEF 2
#define BALLS_SIZE_MAX 3
#define BALLS_SIZE_DEF 8 //GS13 - changed from 2
#define BALLS_SIZE_MAX 40 //GS13 - changed from 3
#define CUM_RATE 2 // units per 10 seconds
#define CUM_RATE 5 // units per 10 seconds //GS13 - upping the production rate
#define CUM_RATE_MULT 1
#define CUM_EFFICIENCY 1 //amount of nutrition required per life()
@@ -60,7 +60,7 @@
#define DEF_BREASTS_SHAPE "Pair"
#define MILK_RATE 3
#define MILK_RATE 5 //GS13 - production rate
#define MILK_RATE_MULT 1
#define MILK_EFFICIENCY 1
code/__HELPERS/mobs.dm
+1
View File
@@ -201,6 +201,7 @@
"balls_cum_rate" = CUM_RATE,
"balls_cum_mult" = CUM_RATE_MULT,
"balls_efficiency" = CUM_EFFICIENCY,
"balls_fluid" = /datum/reagent/consumable/semen, //GS13 - hs13 content
"has_breasts" = FALSE,
"breasts_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
"breasts_size" = pick(CONFIG_GET(keyed_list/breasts_cups_prefs)),
code/datums/ruins/lavaland.dm
+9 -8
View File
@@ -52,14 +52,15 @@
cost = 10
allow_duplicates = FALSE
/datum/map_template/ruin/lavaland/ash_walker
name = "Ash Walker Nest"
id = "ash-walker"
description = "A race of unbreathing lizards live here, that run faster than a human can, worship a broken dead city, and are capable of reproducing by something involving tentacles? \
Probably best to stay clear."
suffix = "lavaland_surface_ash_walker1.dmm"
cost = 20
allow_duplicates = FALSE
//GS13 - removed, because we already have ashwalkers on the map by default
// /datum/map_template/ruin/lavaland/ash_walker
// name = "Ash Walker Nest"
// id = "ash-walker"
// description = "A race of unbreathing lizards live here, that run faster than a human can, worship a broken dead city, and are capable of reproducing by something involving tentacles? \
// Probably best to stay clear."
// suffix = "lavaland_surface_ash_walker1.dmm"
// cost = 20
// allow_duplicates = FALSE
/datum/map_template/ruin/lavaland/syndicate_base
name = "Syndicate Lava Base"
code/game/objects/structures/beds_chairs/chair.dm
+41 -16
View File
@@ -14,6 +14,8 @@
var/buildstackamount = 1
var/item_chair = /obj/item/chair // if null it can't be picked up
layer = OBJ_LAYER
var/paddingcolor = "" //GS13 - better comfy chairs
var/mutable_appearance/lower
/obj/structure/chair/examine(mob/user)
. = ..()
@@ -26,6 +28,14 @@
if(!anchored) //why would you put these on the shuttle?
addtimer(CALLBACK(src, PROC_REF(RemoveFromLatejoin)), 0)
lower = GetLower() //if the chair has a lower part.
lower.layer = TABLE_LAYER
add_overlay(lower)
return ..()
/obj/structure/chair/proc/GetLower()
return mutable_appearance('GainStation13/icons/obj/chairs.dmi', "[icon_state]_lower") //GS13 - better chairs
/obj/structure/chair/ComponentInitialize()
. = ..()
AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, PROC_REF(can_user_rotate),CALLBACK(src), PROC_REF(can_be_rotated)),null)
@@ -183,21 +193,32 @@
/obj/structure/chair/comfy
name = "comfy chair"
desc = "It looks comfy."
icon = 'GainStation13/icons/obj/chairs.dmi' //GS13 - better sprites
icon_state = "comfychair"
color = rgb(255,255,255)
resistance_flags = FLAMMABLE
max_integrity = 70
buildstackamount = 2
item_chair = null
paddingcolor = "#e82d2d" //GS13 - better comfy chairs
var/mutable_appearance/armrest
var/mutable_appearance/padding
/obj/structure/chair/comfy/Initialize(mapload) //GS13 - better comfy chairs
padding = GetPadding()
padding.color = paddingcolor
if(paddingcolor)
add_overlay(padding)
/obj/structure/chair/comfy/Initialize(mapload)
armrest = GetArmrest()
armrest.layer = ABOVE_MOB_LAYER
return ..()
/obj/structure/chair/comfy/proc/GetArmrest()
return mutable_appearance('icons/obj/chairs.dmi', "comfychair_armrest")
return mutable_appearance('GainStation13/icons/obj/chairs.dmi', "comfychair_armrest") //GS13 - better comfy chairs
/obj/structure/chair/comfy/proc/GetPadding()
return mutable_appearance('GainStation13/icons/obj/chairs.dmi', "comfychair_padding") //GS13 - better comfy chairs
/obj/structure/chair/comfy/Destroy()
QDEL_NULL(armrest)
@@ -217,26 +238,29 @@
. = ..()
update_armrest()
/obj/structure/chair/comfy/brown
color = rgb(255,113,0)
/obj/structure/chair/comfy/brown //GS13 - better comfy chairs
paddingcolor = rgb(255,113,0)
/obj/structure/chair/comfy/beige
color = rgb(255,253,195)
/obj/structure/chair/comfy/beige //GS13 - better comfy chairs
paddingcolor = rgb(255,253,195)
/obj/structure/chair/comfy/teal
color = rgb(0,255,255)
/obj/structure/chair/comfy/teal //GS13 - better comfy chairs
paddingcolor = rgb(0,255,255)
/obj/structure/chair/comfy/black
color = rgb(167,164,153)
/obj/structure/chair/comfy/black //GS13 - better comfy chairs
paddingcolor = rgb(167,164,153)
/obj/structure/chair/comfy/green
color = rgb(81,173,106)
/obj/structure/chair/comfy/lime //GS13 - better comfy chairs
paddingcolor = rgb(255,251,0)
/obj/structure/chair/comfy/lime
color = rgb(255,251,0)
/obj/structure/chair/comfy/blue //GS13 - better comfy chairs
paddingcolor = rgb(125, 137, 218)
/obj/structure/chair/comfy/purple
color = rgb(255,50,230)
/obj/structure/chair/comfy/green //GS13 - better comfy chairs
paddingcolor = rgb(102, 137, 81)
/obj/structure/chair/comfy/purple //GS13 - better comfy chairs
paddingcolor = rgb(130, 86, 171)
/obj/structure/chair/comfy/plywood
name = "plywood chair"
@@ -253,6 +277,7 @@
name = "shuttle seat"
desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights."
icon_state = "shuttle_chair"
paddingcolor = "" //gs13 - padding appearance
/obj/structure/chair/comfy/shuttle/GetArmrest()
return mutable_appearance('icons/obj/chairs.dmi', "shuttle_chair_armrest")
code/game/objects/structures/signs/_signs.dm
+5 -4
View File
@@ -122,10 +122,11 @@
. = ..()
setDir(turn(dir, 90))
/obj/structure/sign/nanotrasen
name = "\improper Nanotrasen Logo"
desc = "A sign with the Nanotrasen Logo on it. Glory to Nanotrasen!"
icon_state = "nanotrasen"
/obj/structure/sign/nanotrasen //GS13 rebranded this whole thing, it's easier to just gato-ify it than replace every single instance of it on every map
name = "\improper GATO Logo"
desc = "A sign with the GATO Logo on it. Glory to GATO!"
icon = 'GainStation13/icons/obj/decals.dmi'
icon_state = "gato"
/obj/structure/sign/logo
name = "nanotrasen logo"
code/modules/arousal/genitals_sprite_accessories.dm
+7 -7
View File
@@ -9,7 +9,7 @@
//DICKS,COCKS,PENISES,WHATEVER YOU WANT TO CALL THEM
/datum/sprite_accessory/penis
icon = 'icons/obj/genitals/penis_onmob.dmi'
icon = 'GainStation13/icons/obj/genitals/penis_onmob.dmi' //GS13 - Hyperstation cocks
name = "penis" //the preview name of the accessory
color_src = "cock_color"
alt_aroused = TRUE
@@ -22,13 +22,13 @@
/datum/sprite_accessory/penis/knotted
icon_state = "knotted"
name = "Knotted"
taur_icon = 'icons/obj/genitals/taur_penis_onmob.dmi'
taur_icon = 'GainStation13/icons/obj/genitals/taur_penis_onmob.dmi' //GS13 - Hyperstation cocks
taur_dimension_x = 64
/datum/sprite_accessory/penis/flared
icon_state = "flared"
name = "Flared"
taur_icon = 'icons/obj/genitals/taur_penis_onmob.dmi'
taur_icon = 'GainStation13/icons/obj/genitals/taur_penis_onmob.dmi' //GS13 - Hyperstation cocks
taur_dimension_x = 64
/datum/sprite_accessory/penis/barbknot
@@ -38,7 +38,7 @@
/datum/sprite_accessory/penis/tapered
icon_state = "tapered"
name = "Tapered"
taur_icon = 'icons/obj/genitals/taur_penis_onmob.dmi'
taur_icon = 'GainStation13/icons/obj/genitals/taur_penis_onmob.dmi' //GS13 - Hyperstation cocks
taur_dimension_x = 64
/datum/sprite_accessory/penis/tentacle
@@ -55,7 +55,7 @@
//Testicles
/datum/sprite_accessory/testicles
icon = 'icons/obj/genitals/testicles_onmob.dmi'
icon = 'GainStation13/icons/obj/genitals/testicles_onmob.dmi' //GS13 - Hyperstation cocks
icon_state = "testicle"
name = "testicle" //the preview name of the accessory
color_src = "balls_color"
@@ -70,7 +70,7 @@
//Vaginas
/datum/sprite_accessory/vagina
icon = 'icons/obj/genitals/vagina_onmob.dmi'
icon = 'GainStation13/icons/obj/genitals/vagina_onmob.dmi' //GS13 - Hyperstation cocks
name = "vagina"
color_src = "vag_color"
alt_aroused = TRUE
@@ -108,7 +108,7 @@
//BREASTS BE HERE
/datum/sprite_accessory/breasts
icon = 'icons/obj/genitals/breasts_onmob.dmi'
icon = 'GainStation13/icons/obj/genitals/breasts_onmob.dmi' //GS13 - Hyperstation cocks
name = "breasts"
color_src = "breasts_color"
code/modules/arousal/organs/breasts.dm
+3 -3
View File
@@ -1,11 +1,11 @@
#define BREASTS_ICON_MIN_SIZE 1
#define BREASTS_ICON_MAX_SIZE 6
#define BREASTS_ICON_MAX_SIZE 30
/obj/item/organ/genital/breasts
name = "breasts"
desc = "Female milk producing organs."
icon_state = "breasts"
icon = 'icons/obj/genitals/breasts.dmi'
icon = 'GainStation13/icons/obj/genitals/breasts.dmi' //GS13 - hyperstation boobers
zone = BODY_ZONE_CHEST
slot = ORGAN_SLOT_BREASTS
size = BREASTS_SIZE_DEF // "c". Refer to the breast_values static list below for the cups associated number values
@@ -20,7 +20,7 @@
unarousal_verb = "Your breasts no longer feel sensitive"
orgasm_verb = "leaking"
fluid_transfer_factor = 0.5
var/static/list/breast_values = list("a" = 1, "b" = 2, "c" = 3, "d" = 4, "e" = 5, "f" = 6, "g" = 7, "h" = 8, "i" = 9, "j" = 10, "k" = 11, "l" = 12, "m" = 13, "n" = 14, "o" = 15, "huge" = 16, "flat" = 0)
var/static/list/breast_values = list("a" = 1, "b" = 2, "c" = 3, "d" = 4, "e" = 5, "f" = 6, "g" = 7, "h" = 8, "i" = 9, "j" = 10, "k" = 11, "l" = 12, "m" = 13, "n" = 14, "o" = 15, "huge" = 16, "massive" = 17, "giga" = 25, "impossible" = 30, "flat" = 0)
var/cached_size //these two vars pertain size modifications and so should be expressed in NUMBERS.
var/prev_size //former cached_size value, to allow update_size() to early return should be there no significant changes.
code/modules/arousal/organs/penis.dm
+11 -8
View File
@@ -2,11 +2,11 @@
name = "penis"
desc = "A male reproductive organ."
icon_state = "penis"
icon = 'icons/obj/genitals/penis.dmi'
icon = 'GainStation13/icons/obj/genitals/penis.dmi'
zone = BODY_ZONE_PRECISE_GROIN
slot = ORGAN_SLOT_PENIS
masturbation_verb = "stroke"
can_climax = TRUE
can_climax = TRUE
arousal_verb = "You pop a boner"
unarousal_verb = "Your boner goes down"
genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH|GENITAL_CAN_AROUSE|UPDATE_OWNER_APPEARANCE|GENITAL_UNDIES_HIDDEN|GENITAL_CAN_TAUR
@@ -16,7 +16,6 @@
size = 2 //arbitrary value derived from length and diameter for sprites.
layer_index = PENIS_LAYER_INDEX
var/length = 6 //inches
var/prev_length = 6 //really should be renamed to prev_length
var/diameter = 4.38
var/diameter_ratio = COCK_DIAMETER_RATIO_DEF //0.25; check citadel_defines.dm
@@ -41,14 +40,18 @@
var/rounded_length = round(length)
var/new_size
switch(rounded_length)
if(0 to 6) //If modest size
if(0 to 4) //If modest size
new_size = 1
if(7 to 11) //If large
if(5 to 10) //If large
new_size = 2
if(12 to 36) //If massive
if(11 to 18) //If massive
new_size = 3
if(37 to INFINITY) //If comical
new_size = 4 //no new sprites for anything larger yet
if(18 to 26) //If massive
new_size = 3
if(26 to 34) //If massive
new_size = 4
if(34 to INFINITY) //If comical
new_size = 5 //no new sprites for anything larger yet
if(linked_organ)
linked_organ.size = clamp(size + new_size, BALLS_SIZE_MIN, BALLS_SIZE_MAX)
code/modules/arousal/organs/testicles.dm
+1
View File
@@ -64,6 +64,7 @@
else
color = "#[D.features["balls_color"]]"
shape = D.features["balls_shape"]
fluid_id = D.features["balls_fluid"]
fluid_rate = D.features["balls_cum_rate"]
fluid_mult = D.features["balls_cum_mult"]
fluid_efficiency = D.features["balls_efficiency"]
code/modules/client/preferences.dm
+33 -2
View File
@@ -769,6 +769,22 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<span style='border: 1px solid #161616; background-color: #[features["balls_color"]];'><font color='[color_hex2num(features["balls_color"]) < 200 ? "FFFFFF" : "000000"]'>#[features["balls_color"]]</font></span> <a href='?_src_=prefs;preference=balls_color;task=input'>Change</a><br>"
dat += "<b>Testicles Shape:</b> <a style='display:block;width:120px' href='?_src_=prefs;preference=balls_shape;task=input'>[features["balls_shape"]]</a>"
dat += "<b>Testicles Visibility:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=balls_visibility;task=input'>[features["balls_visibility"]]</a>"
dat += "<b>Produces:</b>"
switch(features["balls_fluid"])
if(/datum/reagent/consumable/milk)
dat += "<a style='display:block;width:50px' href='?_src_=prefs;preference=balls_fluid;task=input'>Milk</a>"
if(/datum/reagent/water)
dat += "<a style='display:block;width:50px' href='?_src_=prefs;preference=balls_fluid;task=input'>Water</a>"
if(/datum/reagent/consumable/semen)
dat += "<a style='display:block;width:50px' href='?_src_=prefs;preference=balls_fluid;task=input'>Semen</a>"
if(/datum/reagent/consumable/alienhoney)
dat += "<a style='display:block;width:50px' href='?_src_=prefs;preference=balls_fluid;task=input'>Honey</a>"
if(/datum/reagent/consumable/nutriment)
dat += "<a style='display:block;width:50px' href='?_src_=prefs;preference=balls_fluid;task=input'>Nutriment</a>"
if(/datum/reagent/blueberry_juice)
dat += "<a style='display:block;width:50px' href='?_src_=prefs;preference=balls_fluid;task=input'>Berry Juice</a>"
else
dat += "<a style='display:block;width:50px' href='?_src_=prefs;preference=balls_fluid;task=input'>Nothing?</a>"
dat += APPEARANCE_CATEGORY_COLUMN
dat += "<h3>Vagina</h3>"
dat += "<a style='display:block;width:50px' href='?_src_=prefs;preference=has_vag'>[features["has_vag"] == TRUE ? "Yes" : "No"]</a>"
@@ -809,8 +825,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<a style='display:block;width:50px' href='?_src_=prefs;preference=breasts_fluid;task=input'>Femcum</a>"
if(/datum/reagent/consumable/alienhoney)
dat += "<a style='display:block;width:50px' href='?_src_=prefs;preference=breasts_fluid;task=input'>Honey</a>"
if(/datum/reagent/consumable/milk/pinkmilk)
dat += "<a style='display:block;width:50px' href='?_src_=prefs;preference=breasts_fluid;task=input'>Strawberry Milk</a>"
if(/datum/reagent/consumable/nutriment)
dat += "<a style='display:block;width:50px' href='?_src_=prefs;preference=breasts_fluid;task=input'>Nutriment</a>"
if(/datum/reagent/blueberry_juice)
@@ -2657,6 +2671,23 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(new_shape)
features["balls_shape"] = new_shape
if("balls_fluid")
var/new_shape
new_shape = input(user, "Balls Fluid", "Character Preference") as null|anything in GLOB.genital_fluids_list
switch(new_shape)
if("Milk")
features["balls_fluid"] = /datum/reagent/consumable/milk
if("Water")
features["balls_fluid"] = /datum/reagent/water
if("Semen")
features["balls_fluid"] = /datum/reagent/consumable/semen
if("Honey")
features["balls_fluid"] = /datum/reagent/consumable/alienhoney
if("Nutriment")
features["balls_fluid"] = /datum/reagent/consumable/nutriment
if("Berry Juice")
features["balls_fluid"] = /datum/reagent/blueberry_juice
if("balls_visibility")
var/n_vis = input(user, "Testicles Visibility", "Character Preference") as null|anything in CONFIG_GET(str_list/safe_visibility_toggles)
if(n_vis)
code/modules/client/preferences_savefile.dm
+2
View File
@@ -954,6 +954,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["object_tf"] >> object_tf
S["blueberry_inflation"] >> blueberry_inflation
S["feature_breasts_fluid"] >> features["breasts_fluid"]
S["feature_balls_fluid"] >> features["balls_fluid"]
S["alt_titles_preferences"] >> alt_titles_preferences
//gear loadout
if(istext(S["loadout"]))
@@ -1284,6 +1285,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["feature_balls_shape"], features["balls_shape"])
WRITE_FILE(S["feature_balls_size"], features["balls_size"])
WRITE_FILE(S["feature_balls_visibility"], features["balls_visibility"])
WRITE_FILE(S["feature_balls_fluid"], features["balls_fluid"])
WRITE_FILE(S["feature_has_breasts"], features["has_breasts"])
WRITE_FILE(S["feature_breasts_size"], features["breasts_size"])
code/modules/vending/cigarette.dm
+2
View File
@@ -5,6 +5,7 @@
product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs."
icon_state = "cigs"
products = list(/obj/item/storage/fancy/cigarettes = 5,
/obj/item/storage/fancy/cigarettes/gatito = 4, //GS13 - gato products
/obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
/obj/item/storage/fancy/cigarettes/cigpack_robust = 3,
/obj/item/storage/fancy/cigarettes/cigpack_carp = 3,
@@ -47,6 +48,7 @@
product_ads = "Probably not bad for you!;Dope will get you through times of no money better than money will get you through times of no dope!;It's good for you!"
product_slogans = "Turn on, tune in, drop out!;Better living through chemistry!;Toke!;Don't forget to keep a smile on your lips and a song in your heart!"
products = list(/obj/item/storage/fancy/cigarettes = 5,
/obj/item/storage/fancy/cigarettes/gatito = 4, //GS13 - gato products
/obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
/obj/item/storage/fancy/cigarettes/cigpack_robust = 3,
/obj/item/storage/fancy/cigarettes/cigpack_carp = 3,