diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index ab3c4565355..49d12a48478 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -29,7 +29,7 @@ /obj/machinery/computer/crew/update_icon() if(stat & BROKEN) - icon_state = "broken" + icon_state = "crewb" else if(stat & NOPOWER) src.icon_state = "c_unpowered" diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index 93fc84f97c7..07208e5b656 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -60,21 +60,21 @@ var/list/event_last_fired = list() possibleEvents[/datum/event/infestation] = 50 + 25 * active_with_role["Janitor"] possibleEvents[/datum/event/communications_blackout] = 50 + 25 * active_with_role["AI"] + active_with_role["Scientist"] * 25 - possibleEvents[/datum/event/ionstorm] = 25 + active_with_role["AI"] * 25 + active_with_role["Cyborg"] * 25 + active_with_role["Engineer"] * 10 + active_with_role["Scientist"] * 5 - possibleEvents[/datum/event/grid_check] = 25 + 10 * active_with_role["Engineer"] - possibleEvents[/datum/event/electrical_storm] = 75 + 25 * active_with_role["Janitor"] + 5 * active_with_role["Engineer"] - possibleEvents[/datum/event/wallrot] = 50 * active_with_role["Engineer"] + 100 * active_with_role["Botanist"] + possibleEvents[/datum/event/ionstorm] = active_with_role["AI"] * 25 + active_with_role["Cyborg"] * 25 + active_with_role["Engineer"] * 10 + active_with_role["Scientist"] * 5 + possibleEvents[/datum/event/grid_check] = 25 + 20 * active_with_role["Engineer"] + possibleEvents[/datum/event/electrical_storm] = 10 * active_with_role["Janitor"] + 5 * active_with_role["Engineer"] + possibleEvents[/datum/event/wallrot] = 30 * active_with_role["Engineer"] + 50 * active_with_role["Botanist"] if(!spacevines_spawned) - possibleEvents[/datum/event/spacevine] = 5 + 10 * active_with_role["Engineer"] + possibleEvents[/datum/event/spacevine] = 5 + 5 * active_with_role["Engineer"] if(minutes_passed >= 30) // Give engineers time to set up engine - possibleEvents[/datum/event/meteor_wave] = 20 * active_with_role["Engineer"] - possibleEvents[/datum/event/meteor_shower] = 80 * active_with_role["Engineer"] - possibleEvents[/datum/event/blob] = 30 * active_with_role["Engineer"] + possibleEvents[/datum/event/meteor_wave] = 10 * active_with_role["Engineer"] + possibleEvents[/datum/event/meteor_shower] = 40 * active_with_role["Engineer"] + possibleEvents[/datum/event/blob] = 20 * active_with_role["Engineer"] possibleEvents[/datum/event/viral_infection] = 25 + active_with_role["Medical"] * 100 if(active_with_role["Medical"] > 0) - possibleEvents[/datum/event/radiation_storm] = active_with_role["Medical"] * 100 + possibleEvents[/datum/event/radiation_storm] = active_with_role["Medical"] * 50 possibleEvents[/datum/event/spontaneous_appendicitis] = active_with_role["Medical"] * 150 possibleEvents[/datum/event/viral_outbreak] = active_with_role["Medical"] * 10 possibleEvents[/datum/event/organ_failure] = active_with_role["Medical"] * 50 diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm index 585cf6122a2..89347a299d9 100644 --- a/code/modules/events/event_manager.dm +++ b/code/modules/events/event_manager.dm @@ -2,8 +2,8 @@ var/list/allEvents = typesof(/datum/event) - /datum/event var/list/potentialRandomEvents = typesof(/datum/event) - /datum/event //var/list/potentialRandomEvents = typesof(/datum/event) - /datum/event - /datum/event/spider_infestation - /datum/event/alien_infestation -var/eventTimeLower = 6000 //10 minutes -var/eventTimeUpper = 12000 //15 minutes +var/eventTimeLower = 9000 //15 minutes +var/eventTimeUpper = 15000 //25 minutes var/scheduledEvent = null diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index d9cca33e725..99e2d69e0ea 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -8,9 +8,10 @@ /datum/event/radiation_storm/start() spawn() + world << sound('sound/AI/radiation.ogg') command_alert("High levels of radiation detected near the station. Please evacuate into one of the shielded maintenance tunnels.", "Anomaly Alert") - sleep(200) + sleep(600) command_alert("The station has entered the radiation belt. Please remain in a sheltered area until we have passed the radiation belt.", "Anomaly Alert") for(var/i = 0, i < 10, i++) @@ -23,9 +24,9 @@ if(istype(T.loc, /area/maintenance) || istype(T.loc, /area/crew_quarters)) continue if(istype(H,/mob/living/carbon/human)) - H.apply_effect((rand(5,25)),IRRADIATE,0) + H.apply_effect((rand(2,15)),IRRADIATE,0) if(prob(5)) - H.apply_effect((rand(30,50)),IRRADIATE,0) + H.apply_effect((rand(10,30)),IRRADIATE,0) if (prob(75)) randmutb(H) domutcheck(H,null,1) @@ -39,7 +40,7 @@ if(T.z != 1) continue M.apply_effect((rand(5,25)),IRRADIATE,0) - sleep(50) + sleep(100) - command_alert("The station has passed the radiation belt. Please report to medbay if you experience any unusual symptoms.", "Anomaly Alert") \ No newline at end of file + command_alert("The station has passed the radiation belt. Please report to medbay if you experience any unusual symptoms.", "Anomaly Alert") diff --git a/code/modules/events/spontaneous_appendicitis.dm b/code/modules/events/spontaneous_appendicitis.dm index 8a2b8133b47..1bba7866bf2 100644 --- a/code/modules/events/spontaneous_appendicitis.dm +++ b/code/modules/events/spontaneous_appendicitis.dm @@ -1,5 +1,5 @@ /datum/event/spontaneous_appendicitis/start() - for(var/mob/living/carbon/human/H in shuffle(living_mob_list)) + for(var/mob/living/carbon/human/H in shuffle(living_mob_list)) if(H.client && H.stat != DEAD) var/foundAlready = 0 //don't infect someone that already has the virus for(var/datum/disease/D in H.viruses) foundAlready = 1 diff --git a/code/modules/events/viral_infection.dm b/code/modules/events/viral_infection.dm index 2798e51dfbc..b7add26ef28 100644 --- a/code/modules/events/viral_infection.dm +++ b/code/modules/events/viral_infection.dm @@ -14,7 +14,7 @@ datum/event/viral_infection/announce() datum/event/viral_infection/start() var/list/candidates = list() //list of candidate keys for(var/mob/living/carbon/human/G in player_list) - if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD)) + if(G.client && G.stat != DEAD) candidates += G if(!candidates.len) return candidates = shuffle(candidates)//Incorporating Donkie's list shuffle diff --git a/code/modules/events/viral_outbreak.dm b/code/modules/events/viral_outbreak.dm index 7a21ecccf9c..708b6c203c2 100644 --- a/code/modules/events/viral_outbreak.dm +++ b/code/modules/events/viral_outbreak.dm @@ -14,7 +14,7 @@ datum/event/viral_outbreak/announce() datum/event/viral_outbreak/start() var/list/candidates = list() //list of candidate keys for(var/mob/living/carbon/human/G in player_list) - if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD)) + if(G.client && G.stat != DEAD) candidates += G if(!candidates.len) return candidates = shuffle(candidates)//Incorporating Donkie's list shuffle diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 2a475b1dd31..816e2a33906 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -416,7 +416,7 @@ var/list/department_radio_keys = list( message_b = voice_message else message_b = stars(message) - message_b = say_quote(message,is_speaking_soghun,is_speaking_skrell,is_speaking_taj) + message_b = say_quote(message_b,is_speaking_soghun,is_speaking_skrell,is_speaking_taj) if (italics) message_b = "[message_b]" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 0ac3e9eb05b..0f68161d442 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -123,7 +123,10 @@ updatename(mod) module = new /obj/item/weapon/robot_module/standard(src) hands.icon_state = "standard" - icon_state = "robot" + var/icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Standard") + switch(icontype) + if("Basic") icon_state = "robot_old" + else icon_state = "robot" modtype = "Stand" feedback_inc("cyborg_standard",1) @@ -145,7 +148,11 @@ updatename(mod) module = new /obj/item/weapon/robot_module/miner(src) hands.icon_state = "miner" - icon_state = "Miner" + var/icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Advanced Droid", "Treadhead") + switch(icontype) + if("Basic") icon_state = "Miner_old" + if("Advanced Droid") icon_state = "droid-miner" + else icon_state = "Miner" modtype = "Miner" feedback_inc("cyborg_miner",1) channels = list("Mining" = 1) @@ -154,7 +161,12 @@ updatename(mod) module = new /obj/item/weapon/robot_module/medical(src) hands.icon_state = "medical" - icon_state = "surgeon" + var/icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Advanced Droid", "Needles", "Hoverbot") + switch(icontype) + if("Basic") icon_state = "Medbot" + if("Advanced Droid") icon_state = "droid-medical" + if("Needles") icon_state = "medicalrobot" + else icon_state = "surgeon" modtype = "Med" status_flags &= ~CANPUSH feedback_inc("cyborg_medical",1) @@ -164,7 +176,12 @@ updatename(mod) module = new /obj/item/weapon/robot_module/security(src) hands.icon_state = "security" - icon_state = "bloodhound" + var/icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Red Knight", "Black Knight", "Bloodhound") + switch(icontype) + if("Basic") icon_state = "secborg" + if("Red Knight") icon_state = "Security" + if("Black Knight") icon_state = "securityrobot" + else icon_state = "bloodhound" modtype = "Sec" //speed = -1 Secborgs have nerfed tasers now, so the speed boost is not necessary status_flags &= ~CANPUSH @@ -175,7 +192,11 @@ updatename(mod) module = new /obj/item/weapon/robot_module/engineering(src) hands.icon_state = "engineer" - icon_state = "landmate" + var/icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Antique", "Landmate") + switch(icontype) + if("Basic") icon_state = "Engineering" + if("Antique") icon_state = "Engineerrobot" + else icon_state = "landmate" modtype = "Eng" feedback_inc("cyborg_engineering",1) channels = list("Engineering" = 1) @@ -184,7 +205,11 @@ updatename(mod) module = new /obj/item/weapon/robot_module/janitor(src) hands.icon_state = "janitor" - icon_state = "mopgearrex" + var/icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Mopbot", "Zamboni") + switch(icontype) + if("Basic") icon_state = "JanBot2" + if("Mopbot") icon_state = "janitorrobot" + else icon_state = "mopgearrex" modtype = "Jan" feedback_inc("cyborg_janitor",1) @@ -210,6 +235,7 @@ /mob/living/silicon/robot/verb/Namepick() if(custom_name) return 0 + spawn(0) var/newname newname = input(src,"You are a robot. Enter a name, or leave blank for the default name.", "Name change","") as text diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 9306bc3899e..685122e05c5 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -92,6 +92,7 @@ loaded -= AC AM.loc = get_turf(src) empty_mag = null + update_icon() user << "\blue You unload magazine from \the [src]!" else user << "\red Nothing loaded in \the [src]!" diff --git a/html/changelog.html b/html/changelog.html index c9c3df4cbc6..8287d61b2d4 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -69,6 +69,14 @@ should be listed in the changelog upon commit though. Thanks. -->
  • Xenoarchaeology picksets can now hold everything they started with.
    • + +
    +

    28th May 2013

    +

    Erthilo updated:

    + +

    26th May 2013

    @@ -80,20 +88,8 @@ should be listed in the changelog upon commit though. Thanks. --> -
    - -
    -

    25th May 2013

    -

    Erthilo updated:

    -
    -
    -

    5/26/2013

    Meyar updated:

    @@ -108,6 +104,16 @@ should be listed in the changelog upon commit though. Thanks. -->
    +
    +

    25th May 2013

    +

    Erthilo updated:

    + +
    +

    21 May 2013

    SkyMarshal updated:

    @@ -134,16 +140,6 @@ should be listed in the changelog upon commit though. Thanks. -->
    -
    -

    25th May 2013

    -

    Erthilo updated:

    - -
    -

    April 24, 2013

    Jediluke69 updated:

    diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi index e0e658ed6fb..9b41d0adfc3 100644 Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ