mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-13 00:47:42 +01:00
Merge branch 'MrSky12:master' into master
This commit is contained in:
Alphas00
@@ -26,8 +26,8 @@
|
||||
response_help = "pets"
|
||||
response_disarm = "shoos"
|
||||
response_harm = "hits"
|
||||
maxHealth = 20
|
||||
health = 20
|
||||
maxHealth = 200
|
||||
health = 200
|
||||
obj_damage = 0
|
||||
melee_damage_lower = 0.001
|
||||
melee_damage_upper = 0.001
|
||||
|
||||
@@ -145,3 +145,13 @@
|
||||
. += mutable_appearance('icons/effects/blood.dmi', "uniformblood", color = blood_DNA_to_color())
|
||||
if(accessory_overlay)
|
||||
. += accessory_overlay
|
||||
|
||||
|
||||
/obj/item/clothing/under/color/grey/modular/bra
|
||||
name = "grey modular bra"
|
||||
desc = "A tasteful grey bra that reminds you of the good old days. Now adjusts to the match the wearer's size!"
|
||||
icon_location = 'GainStation13/icons/mob/modclothes/graymodular_bra.dmi'
|
||||
icon = 'GainStation13/icons/mob/modclothes/gray_bra.dmi'
|
||||
icon_state = "grey"
|
||||
item_state = "defaultsuit"
|
||||
item_color = "defaultsuit"
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 384 B |
Binary file not shown.
|
After Width: | Height: | Size: 25 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
@@ -1,68 +1,68 @@
|
||||
// //Radiation storms occur when the station passes through an irradiated area, and irradiate anyone not standing in protected areas (maintenance, emergency storage, etc.)
|
||||
// /datum/weather/rad_storm
|
||||
// name = "radiation storm"
|
||||
// desc = "A cloud of intense radiation passes through the area dealing rad damage to those who are unprotected."
|
||||
//Radiation storms occur when the station passes through an irradiated area, and irradiate anyone not standing in protected areas (maintenance, emergency storage, etc.)
|
||||
/datum/weather/rad_storm
|
||||
name = "radiation storm"
|
||||
desc = "A cloud of intense radiation passes through the area dealing rad damage to those who are unprotected."
|
||||
|
||||
// telegraph_duration = 400
|
||||
// telegraph_message = "<span class='danger'>The air begins to grow warm.</span>"
|
||||
telegraph_duration = 400
|
||||
telegraph_message = "<span class='danger'>The air begins to grow warm.</span>"
|
||||
|
||||
// weather_message = "<span class='userdanger'><i>You feel waves of heat wash over you! Find shelter!</i></span>"
|
||||
// weather_overlay = "ash_storm"
|
||||
// weather_duration_lower = 600
|
||||
// weather_duration_upper = 1500
|
||||
// weather_color = "green"
|
||||
// weather_sound = 'sound/misc/bloblarm.ogg'
|
||||
weather_message = "<span class='userdanger'><i>You feel waves of heat wash over you! Find shelter!</i></span>"
|
||||
weather_overlay = "ash_storm"
|
||||
weather_duration_lower = 600
|
||||
weather_duration_upper = 1500
|
||||
weather_color = "green"
|
||||
weather_sound = 'sound/misc/bloblarm.ogg'
|
||||
|
||||
// end_duration = 100
|
||||
// end_message = "<span class='notice'>The air seems to be cooling off again.</span>"
|
||||
end_duration = 100
|
||||
end_message = "<span class='notice'>The air seems to be cooling off again.</span>"
|
||||
|
||||
// area_type = /area
|
||||
// protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
|
||||
// /area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/survivalpod, /area/crew_quarters/dorms, /area/security/prison, /area/ruin, /area/space/nearstation)
|
||||
// target_trait = ZTRAIT_STATION
|
||||
area_type = /area
|
||||
protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
|
||||
/area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/survivalpod, /area/crew_quarters/dorms, /area/security/prison, /area/ruin, /area/space/nearstation)
|
||||
target_trait = ZTRAIT_STATION
|
||||
|
||||
// immunity_type = "rad"
|
||||
immunity_type = "rad"
|
||||
|
||||
// /datum/weather/rad_storm/telegraph()
|
||||
// ..()
|
||||
// status_alarm(TRUE)
|
||||
/datum/weather/rad_storm/telegraph()
|
||||
..()
|
||||
status_alarm(TRUE)
|
||||
|
||||
// /datum/weather/rad_storm/weather_act(mob/living/L)
|
||||
// var/resist = L.getarmor(null, "rad")
|
||||
// if(prob(40))
|
||||
// if(ishuman(L))
|
||||
// var/mob/living/carbon/human/H = L
|
||||
// if(H.dna && !HAS_TRAIT(H, TRAIT_RADIMMUNE))
|
||||
// if(prob(max(0,100-resist)))
|
||||
// H.randmuti()
|
||||
// if(prob(50))
|
||||
// if(prob(90))
|
||||
// H.easy_randmut(NEGATIVE+MINOR_NEGATIVE)
|
||||
// else
|
||||
// H.easy_randmut(POSITIVE)
|
||||
// H.domutcheck()
|
||||
// L.rad_act(20)
|
||||
/datum/weather/rad_storm/weather_act(mob/living/L)
|
||||
var/resist = L.getarmor(null, "rad")
|
||||
if(prob(40))
|
||||
if(ishuman(L))
|
||||
var/mob/living/carbon/human/H = L
|
||||
if(H.dna && !HAS_TRAIT(H, TRAIT_RADIMMUNE))
|
||||
if(prob(max(0,100-resist)))
|
||||
H.randmuti()
|
||||
if(prob(50))
|
||||
if(prob(90))
|
||||
H.easy_randmut(NEGATIVE+MINOR_NEGATIVE)
|
||||
else
|
||||
H.easy_randmut(POSITIVE)
|
||||
H.domutcheck()
|
||||
L.rad_act(20)
|
||||
|
||||
// /datum/weather/rad_storm/end()
|
||||
// if(..())
|
||||
// return
|
||||
// priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert")
|
||||
// status_alarm(FALSE)
|
||||
/datum/weather/rad_storm/end()
|
||||
if(..())
|
||||
return
|
||||
priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert")
|
||||
status_alarm(FALSE)
|
||||
|
||||
// /datum/weather/rad_storm/proc/status_alarm(active) //Makes the status displays show the radiation warning for those who missed the announcement.
|
||||
// var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
|
||||
// if(!frequency)
|
||||
// return
|
||||
/datum/weather/rad_storm/proc/status_alarm(active) //Makes the status displays show the radiation warning for those who missed the announcement.
|
||||
var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
|
||||
if(!frequency)
|
||||
return
|
||||
|
||||
// var/datum/signal/signal = new
|
||||
// if (active)
|
||||
// signal.data["command"] = "alert"
|
||||
// signal.data["picture_state"] = "radiation"
|
||||
// else
|
||||
// signal.data["command"] = "shuttle"
|
||||
var/datum/signal/signal = new
|
||||
if (active)
|
||||
signal.data["command"] = "alert"
|
||||
signal.data["picture_state"] = "radiation"
|
||||
else
|
||||
signal.data["command"] = "shuttle"
|
||||
|
||||
// var/atom/movable/virtualspeaker/virt = new(null)
|
||||
// frequency.post_signal(virt, signal)
|
||||
var/atom/movable/virtualspeaker/virt = new(null)
|
||||
frequency.post_signal(virt, signal)
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -528,19 +528,19 @@
|
||||
// occurances_max = 2
|
||||
// chaos_min = 1.0
|
||||
|
||||
// /datum/dynamic_ruleset/event/radiation_storm //commented out by GS13
|
||||
// name = "Radiation Storm"
|
||||
// //config_tag = "radiation_storm"
|
||||
// typepath = /datum/round_event/radiation_storm
|
||||
// cost = 6
|
||||
// weight = 0
|
||||
// repeatable_weight_decrease = 1
|
||||
// enemy_roles = list("Chemist","Chief Medical Officer","Geneticist","Medical Doctor")
|
||||
// required_enemies = list(2,2,2,2,1,1,1,1,1,0)
|
||||
// requirements = list(5,5,5,5,5,5,5,5,5,5)
|
||||
// high_population_requirement = 100
|
||||
// //property_weights = list("extended" = 1,"chaos" = 1)
|
||||
// occurances_max = 0
|
||||
/datum/dynamic_ruleset/event/radiation_storm //pls keep this disabled, it fucking sucks on long rounds
|
||||
name = "Radiation Storm"
|
||||
//config_tag = "radiation_storm"
|
||||
typepath = /datum/round_event/radiation_storm
|
||||
cost = 600000
|
||||
weight = 0
|
||||
repeatable_weight_decrease = 1
|
||||
enemy_roles = list("Chemist","Chief Medical Officer","Geneticist","Medical Doctor")
|
||||
required_enemies = list(2,2,2,2,1,1,1,1,1,0)
|
||||
requirements = list(5,5,5,5,5,5,5,5,5,5)
|
||||
high_population_requirement = 1000
|
||||
//property_weights = list("extended" = 1,"chaos" = 1)
|
||||
occurances_max = 0
|
||||
|
||||
|
||||
/datum/dynamic_ruleset/event/portal_storm_syndicate
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
// /datum/round_event_control/radiation_storm
|
||||
// name = "Radiation Storm"
|
||||
// typepath = /datum/round_event/radiation_storm
|
||||
// max_occurrences = 1
|
||||
/datum/round_event_control/radiation_storm
|
||||
name = "Radiation Storm"
|
||||
typepath = /datum/round_event/radiation_storm
|
||||
max_occurrences = 1
|
||||
|
||||
// /datum/round_event/radiation_storm
|
||||
/datum/round_event/radiation_storm
|
||||
|
||||
|
||||
// /datum/round_event/radiation_storm/setup()
|
||||
// startWhen = 3
|
||||
// endWhen = startWhen + 1
|
||||
// announceWhen = 1
|
||||
/datum/round_event/radiation_storm/setup()
|
||||
startWhen = 3
|
||||
endWhen = startWhen + 1
|
||||
announceWhen = 1
|
||||
|
||||
// /datum/round_event/radiation_storm/announce(fake)
|
||||
// priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", 'sound/ai/radiation.ogg')
|
||||
// //sound not longer matches the text, but an audible warning is probably good
|
||||
/datum/round_event/radiation_storm/announce(fake)
|
||||
priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", 'sound/ai/radiation.ogg')
|
||||
//sound not longer matches the text, but an audible warning is probably good
|
||||
|
||||
// /datum/round_event/radiation_storm/start()
|
||||
// SSweather.run_weather(/datum/weather/rad_storm)
|
||||
/datum/round_event/radiation_storm/start()
|
||||
SSweather.run_weather(/datum/weather/rad_storm)
|
||||
|
||||
@@ -173,8 +173,8 @@
|
||||
name = "Clogged Vents: Fattening Chems"
|
||||
typepath = /datum/round_event/vent_clog_fat
|
||||
weight = 8
|
||||
max_occurrences = 1
|
||||
min_players = 10
|
||||
max_occurrences = 3
|
||||
min_players = 6
|
||||
|
||||
/datum/round_event/vent_clog_fat
|
||||
announceWhen = 1
|
||||
@@ -184,7 +184,7 @@
|
||||
var/list/vents2 = list()
|
||||
var/randomProbability2 = 1
|
||||
var/reagentsAmount2 = 100
|
||||
var/list/saferChems2 = list(
|
||||
var/list/fatchems = list(
|
||||
/datum/reagent/consumable/lipoifier,
|
||||
/datum/reagent/consumable/nutriment,
|
||||
)
|
||||
@@ -225,7 +225,7 @@
|
||||
if (prob(randomProbability2))
|
||||
R.add_reagent(get_random_reagent_id(), reagentsAmount2)
|
||||
else
|
||||
R.add_reagent(pick(saferChems2), reagentsAmount2)
|
||||
R.add_reagent(pick(fatchems), reagentsAmount2)
|
||||
|
||||
var/datum/effect_system/smoke_spread/chem/smoke_machine/C = new
|
||||
C.set_up(R,16,1,T)
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
layer = WALL_OBJ_LAYER
|
||||
var/list/hit_sounds = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg',\
|
||||
'sound/weapons/punch1.ogg', 'sound/weapons/punch2.ogg', 'sound/weapons/punch3.ogg', 'sound/weapons/punch4.ogg')
|
||||
var/loss_per_punch = 2.5 // GS13
|
||||
var/loss_per_punch = 5 // GS13
|
||||
|
||||
/obj/structure/punching_bag/attack_hand(mob/user as mob)
|
||||
. = ..()
|
||||
|
||||
@@ -625,7 +625,7 @@
|
||||
if(HAS_TRAIT(M, TRAIT_LIPOLICIDE_TOLERANCE)) //GS13 edit
|
||||
M.adjust_fatness(-0.5, FATTENING_TYPE_WEIGHT_LOSS)
|
||||
else
|
||||
M.adjust_fatness(-5, FATTENING_TYPE_WEIGHT_LOSS)
|
||||
M.adjust_fatness(-10, FATTENING_TYPE_WEIGHT_LOSS)
|
||||
|
||||
M.overeatduration = 0
|
||||
return ..()
|
||||
|
||||
Reference in New Issue
Block a user