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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits

Browse Source
This commit is contained in:
Putnam3145
2022-03-30 12:35:12 -07:00
parent b83cc194d4 f6a78bbf83
commit 6199aa4d60
1281 changed files with 75215 additions and 68744 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/_event.dm
+1 -1
View File
@@ -1,4 +1,4 @@
#define RANDOM_EVENT_ADMIN_INTERVENTION_TIME 10
#define RANDOM_EVENT_ADMIN_INTERVENTION_TIME 30
//this datum is used by the events controller to dictate how it selects events
/datum/round_event_control
code/modules/events/atmos_speed.dm
+23
View File
@@ -0,0 +1,23 @@
/datum/round_event_control/atmos_flux
name = "Atmospheric Flux"
typepath = /datum/round_event/atmos_flux
max_occurrences = 1
weight = 5
endWhen = 600
var/original_speed
/datum/round_event/atmos_flux
announceWhen = 1
/datum/round_event/atmos_flux/announce(fake)
priority_announce("Atmospheric flux in your sector detected. Sensors show that air may move [(SSair.share_max_steps_target > original_speed) ? "faster" : "slower"] than usual for some time.", "Atmos Alert")
/datum/round_event/atmos_flux/start()
original_speed = SSair.share_max_steps_target
if(prob(20))
SSair.share_max_steps_target = max(1, original_speed - rand(1,original_speed-1))
else
SSair.share_max_steps_target += rand(2,10)
/datum/round_event/atmos_flux/end()
SSair.share_max_steps_target = original_speed
code/modules/events/supernova.dm
+2 -2
View File
@@ -58,7 +58,7 @@
supernova.power_mod = min(supernova.power_mod*1.2, power)
if(activeFor > endWhen-10)
supernova.power_mod /= 4
if(prob(round(supernova.power_mod)) && prob(3) && storm_count < 5 && !SSweather.get_weather_by_type(/datum/weather/rad_storm))
if(prob(round(supernova.power_mod)) && prob(5-storm_count) && !SSweather.get_weather_by_type(/datum/weather/rad_storm))
SSweather.run_weather(/datum/weather/rad_storm/supernova)
storm_count++
@@ -73,6 +73,6 @@
weather_duration_lower = 50
weather_duration_upper = 100
telegraph_duration = 200
radiation_intensity = 1000
radiation_intensity = 500
weather_sound = null
telegraph_message = "<span class='userdanger'>The air begins to grow very warm!</span>"
code/modules/events/wizard/curseditems.dm
+9 -9
View File
@@ -18,23 +18,23 @@
switch(item_set)
if("wizardmimic")
loadout[SLOT_WEAR_SUIT] = /obj/item/clothing/suit/wizrobe
loadout[SLOT_SHOES] = /obj/item/clothing/shoes/sandal/magic
loadout[SLOT_HEAD] = /obj/item/clothing/head/wizard
loadout[ITEM_SLOT_OCLOTHING] = /obj/item/clothing/suit/wizrobe
loadout[ITEM_SLOT_FEET] = /obj/item/clothing/shoes/sandal/magic
loadout[ITEM_SLOT_HEAD] = /obj/item/clothing/head/wizard
ruins_spaceworthiness = 1
if("swords")
loadout[SLOT_HANDS] = /obj/item/katana/cursed
loadout[ITEM_SLOT_HANDS] = /obj/item/katana/cursed
if("bigfatdoobie")
loadout[SLOT_WEAR_MASK] = /obj/item/clothing/mask/cigarette/rollie/trippy
loadout[ITEM_SLOT_MASK] = /obj/item/clothing/mask/cigarette/rollie/trippy
ruins_spaceworthiness = 1
if("boxing")
loadout[SLOT_WEAR_MASK] = /obj/item/clothing/mask/luchador
loadout[SLOT_GLOVES] = /obj/item/clothing/gloves/boxing
loadout[ITEM_SLOT_MASK] = /obj/item/clothing/mask/luchador
loadout[ITEM_SLOT_GLOVES] = /obj/item/clothing/gloves/boxing
ruins_spaceworthiness = 1
if("voicemodulators")
loadout[SLOT_WEAR_MASK] = /obj/item/clothing/mask/chameleon
loadout[ITEM_SLOT_MASK] = /obj/item/clothing/mask/chameleon
if("catgirls2015")
loadout[SLOT_HEAD] = /obj/item/clothing/head/kitty
loadout[ITEM_SLOT_HEAD] = /obj/item/clothing/head/kitty
ruins_spaceworthiness = 1
ruins_wizard_loadout = 1