diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index 04a8f3cb39..88efc2ffc3 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -1,3 +1,5 @@ +var/global/const/base_law_type = /datum/ai_laws/nanotrasen + /datum/ai_laws var/name = "Unknown Laws" diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index adeca0e03a..2140101f72 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -36,6 +36,7 @@ meteor_wave() spawn_meteors() + /** NOPE! if(2) command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert") world << sound('sound/AI/granomalies.ogg') @@ -43,6 +44,7 @@ var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 ) spawn(rand(50, 300)) 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 command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert") @@ -66,9 +68,12 @@ spawn(rand(300,600)) del(P) */ + + /** NOPE! 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. space_ninja_arrival()//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like. + **/ if(4) mini_blob_event() @@ -76,14 +81,18 @@ high_radiation_event() if(6) viral_outbreak() + /** NOPE! if(7) alien_infestation() + **/ if(8) prison_break() if(9) carp_migration() + /** NOPE! if(10) immovablerod() + **/ if(11) lightsout(1,2) if(12) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 1cdbce4fab..2eb10378b7 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -68,7 +68,7 @@ if (istype(L, /datum/ai_laws)) laws = L else - laws = new /datum/ai_laws/asimov + laws = new base_law_type verbs += /mob/living/silicon/ai/proc/show_laws_verb diff --git a/code/modules/mob/living/silicon/ai/laws.dm b/code/modules/mob/living/silicon/ai/laws.dm index b4cc83867f..904451aa1d 100755 --- a/code/modules/mob/living/silicon/ai/laws.dm +++ b/code/modules/mob/living/silicon/ai/laws.dm @@ -18,7 +18,7 @@ /mob/living/silicon/ai/proc/laws_sanity_check() 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) src.laws_sanity_check() diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm index bdc523dd6b..98fea6f749 100644 --- a/code/modules/mob/living/silicon/robot/laws.dm +++ b/code/modules/mob/living/silicon/robot/laws.dm @@ -70,7 +70,7 @@ /mob/living/silicon/robot/proc/laws_sanity_check() if (!laws) - laws = new /datum/ai_laws/asimov + laws = new base_law_type /mob/living/silicon/robot/proc/set_zeroth_law(var/law) laws_sanity_check() diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 6ac7ac44a4..58b26438e7 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -73,7 +73,7 @@ /mob/proc/AIize() if(client) 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.aiRestorePowerRoutine = 0 diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 5ce977d2fa..b013b93d20 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -17,7 +17,7 @@ var/recharged = 0 var/list/dispensable_reagents = list("hydrogen","lithium","carbon","nitrogen","oxygen","fluorine", "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() if(stat & (BROKEN|NOPOWER)) return diff --git a/code/setup.dm b/code/setup.dm index 8bcfabb16a..71342dcd13 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -61,7 +61,7 @@ #define DOOR_CRUSH_DAMAGE 10 // Factor of how fast mob nutrition decreases -#define HUNGER_FACTOR 0.1 +#define HUNGER_FACTOR 0.05 #define REAGENTS_METABOLISM 0.4 #define MINIMUM_AIR_RATIO_TO_SUSPEND 0.05