mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-29 11:32:13 +00:00
More and yet more fixes from the piratepad.
- AI laws now default to Nanotrasen laws - Removed half the random events - Milk now in chem dispensers - Hunger rate decreased by half
This commit is contained in:
@@ -1,3 +1,5 @@
|
|||||||
|
var/global/const/base_law_type = /datum/ai_laws/nanotrasen
|
||||||
|
|
||||||
|
|
||||||
/datum/ai_laws
|
/datum/ai_laws
|
||||||
var/name = "Unknown Laws"
|
var/name = "Unknown Laws"
|
||||||
|
|||||||
@@ -36,6 +36,7 @@
|
|||||||
meteor_wave()
|
meteor_wave()
|
||||||
spawn_meteors()
|
spawn_meteors()
|
||||||
|
|
||||||
|
/** NOPE!
|
||||||
if(2)
|
if(2)
|
||||||
command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert")
|
command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert")
|
||||||
world << sound('sound/AI/granomalies.ogg')
|
world << sound('sound/AI/granomalies.ogg')
|
||||||
@@ -43,6 +44,7 @@
|
|||||||
var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 )
|
var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 )
|
||||||
spawn(rand(50, 300))
|
spawn(rand(50, 300))
|
||||||
del(bh)
|
del(bh)
|
||||||
|
**/
|
||||||
/*
|
/*
|
||||||
if(3) //Leaving the code in so someone can try and delag it, but this event can no longer occur randomly, per SoS's request. --NEO
|
if(3) //Leaving the code in so someone can try and delag it, but this event can no longer occur randomly, per SoS's request. --NEO
|
||||||
command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert")
|
command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert")
|
||||||
@@ -66,9 +68,12 @@
|
|||||||
spawn(rand(300,600))
|
spawn(rand(300,600))
|
||||||
del(P)
|
del(P)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/** NOPE!
|
||||||
if(3)
|
if(3)
|
||||||
if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round.
|
if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round.
|
||||||
space_ninja_arrival()//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like.
|
space_ninja_arrival()//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like.
|
||||||
|
**/
|
||||||
if(4)
|
if(4)
|
||||||
mini_blob_event()
|
mini_blob_event()
|
||||||
|
|
||||||
@@ -76,14 +81,18 @@
|
|||||||
high_radiation_event()
|
high_radiation_event()
|
||||||
if(6)
|
if(6)
|
||||||
viral_outbreak()
|
viral_outbreak()
|
||||||
|
/** NOPE!
|
||||||
if(7)
|
if(7)
|
||||||
alien_infestation()
|
alien_infestation()
|
||||||
|
**/
|
||||||
if(8)
|
if(8)
|
||||||
prison_break()
|
prison_break()
|
||||||
if(9)
|
if(9)
|
||||||
carp_migration()
|
carp_migration()
|
||||||
|
/** NOPE!
|
||||||
if(10)
|
if(10)
|
||||||
immovablerod()
|
immovablerod()
|
||||||
|
**/
|
||||||
if(11)
|
if(11)
|
||||||
lightsout(1,2)
|
lightsout(1,2)
|
||||||
if(12)
|
if(12)
|
||||||
|
|||||||
@@ -68,7 +68,7 @@
|
|||||||
if (istype(L, /datum/ai_laws))
|
if (istype(L, /datum/ai_laws))
|
||||||
laws = L
|
laws = L
|
||||||
else
|
else
|
||||||
laws = new /datum/ai_laws/asimov
|
laws = new base_law_type
|
||||||
|
|
||||||
verbs += /mob/living/silicon/ai/proc/show_laws_verb
|
verbs += /mob/living/silicon/ai/proc/show_laws_verb
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
/mob/living/silicon/ai/proc/laws_sanity_check()
|
/mob/living/silicon/ai/proc/laws_sanity_check()
|
||||||
if (!src.laws)
|
if (!src.laws)
|
||||||
src.laws = new /datum/ai_laws/asimov
|
src.laws = new base_law_type
|
||||||
|
|
||||||
/mob/living/silicon/ai/proc/set_zeroth_law(var/law, var/law_borg)
|
/mob/living/silicon/ai/proc/set_zeroth_law(var/law, var/law_borg)
|
||||||
src.laws_sanity_check()
|
src.laws_sanity_check()
|
||||||
|
|||||||
@@ -70,7 +70,7 @@
|
|||||||
|
|
||||||
/mob/living/silicon/robot/proc/laws_sanity_check()
|
/mob/living/silicon/robot/proc/laws_sanity_check()
|
||||||
if (!laws)
|
if (!laws)
|
||||||
laws = new /datum/ai_laws/asimov
|
laws = new base_law_type
|
||||||
|
|
||||||
/mob/living/silicon/robot/proc/set_zeroth_law(var/law)
|
/mob/living/silicon/robot/proc/set_zeroth_law(var/law)
|
||||||
laws_sanity_check()
|
laws_sanity_check()
|
||||||
|
|||||||
@@ -73,7 +73,7 @@
|
|||||||
/mob/proc/AIize()
|
/mob/proc/AIize()
|
||||||
if(client)
|
if(client)
|
||||||
src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // stop the jams for AIs
|
src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // stop the jams for AIs
|
||||||
var/mob/living/silicon/ai/O = new (loc, /datum/ai_laws/asimov,,1)//No MMI but safety is in effect.
|
var/mob/living/silicon/ai/O = new (loc, base_law_type,,1)//No MMI but safety is in effect.
|
||||||
O.invisibility = 0
|
O.invisibility = 0
|
||||||
O.aiRestorePowerRoutine = 0
|
O.aiRestorePowerRoutine = 0
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
var/recharged = 0
|
var/recharged = 0
|
||||||
var/list/dispensable_reagents = list("hydrogen","lithium","carbon","nitrogen","oxygen","fluorine",
|
var/list/dispensable_reagents = list("hydrogen","lithium","carbon","nitrogen","oxygen","fluorine",
|
||||||
"sodium","aluminum","silicon","phosphorus","sulfur","chlorine","potassium","iron",
|
"sodium","aluminum","silicon","phosphorus","sulfur","chlorine","potassium","iron",
|
||||||
"copper","mercury","radium","water","ethanol","sugar","sacid")
|
"copper","mercury","radium","water","ethanol","sugar","sacid","milk")
|
||||||
|
|
||||||
/obj/machinery/chem_dispenser/proc/recharge()
|
/obj/machinery/chem_dispenser/proc/recharge()
|
||||||
if(stat & (BROKEN|NOPOWER)) return
|
if(stat & (BROKEN|NOPOWER)) return
|
||||||
|
|||||||
@@ -61,7 +61,7 @@
|
|||||||
#define DOOR_CRUSH_DAMAGE 10
|
#define DOOR_CRUSH_DAMAGE 10
|
||||||
|
|
||||||
// Factor of how fast mob nutrition decreases
|
// Factor of how fast mob nutrition decreases
|
||||||
#define HUNGER_FACTOR 0.1
|
#define HUNGER_FACTOR 0.05
|
||||||
#define REAGENTS_METABOLISM 0.4
|
#define REAGENTS_METABOLISM 0.4
|
||||||
|
|
||||||
#define MINIMUM_AIR_RATIO_TO_SUSPEND 0.05
|
#define MINIMUM_AIR_RATIO_TO_SUSPEND 0.05
|
||||||
|
|||||||
Reference in New Issue
Block a user