diff --git a/code/controllers/subsystems/battle_monsters.dm b/code/controllers/subsystems/battle_monsters.dm index 50510cc0f7d..e9aebeebb40 100644 --- a/code/controllers/subsystems/battle_monsters.dm +++ b/code/controllers/subsystems/battle_monsters.dm @@ -240,6 +240,8 @@ var/datum/controller/subsystem/battle_monsters/SSbattlemonsters return "colossus" if(BATTLE_MONSTERS_DEFENSETYPE_FLYING) return "winged monster" + else + return GetSpecies(card_defense_type," mixed with ") return "unknown" @@ -338,19 +340,22 @@ var/datum/controller/subsystem/battle_monsters/SSbattlemonsters return english_list(included_elements, nothing_text = "Neutral", and_text = and_text) -/datum/controller/subsystem/battle_monsters/proc/GetStarLevel(var/power_rating) - if(power_rating <= BATTLE_MONSTERS_POWER_PETTY) +/datum/controller/subsystem/battle_monsters/proc/GetStarLevel(var/power_rating,var/attack_points,var/defense_points) + + var/power_mod = (power_rating / 2) + (max(attack_points,defense_points)/2) + + if(power_mod <= BATTLE_MONSTERS_POWER_PETTY) return 1 - if(power_rating <= BATTLE_MONSTERS_POWER_LESSER) + if(power_mod <= BATTLE_MONSTERS_POWER_LESSER) return 2 - if(power_rating <= BATTLE_MONSTERS_POWER_COMMON) + if(power_mod <= BATTLE_MONSTERS_POWER_COMMON) return 3 - if(power_rating <= BATTLE_MONSTERS_POWER_GREATER) + if(power_mod <= BATTLE_MONSTERS_POWER_GREATER) return 4 - if(power_rating <= BATTLE_MONSTERS_POWER_GRAND) + if(power_mod <= BATTLE_MONSTERS_POWER_GRAND) return 5 else - return 5 + (power_rating - BATTLE_MONSTERS_POWER_GRAND)/BATTLE_MONSTERS_POWER_UPGRADE + return 5 + round((power_mod - BATTLE_MONSTERS_POWER_GRAND)/BATTLE_MONSTERS_POWER_UPGRADE) /datum/controller/subsystem/battle_monsters/proc/GetSummonRequirements(var/starlevel) if(starlevel <= 2) @@ -498,7 +503,7 @@ var/datum/controller/subsystem/battle_monsters/SSbattlemonsters returning_list["attack_points"] = round(returning_list["power"] * returning_list["attack_points"],100) returning_list["defense_points"] = round(returning_list["power"] * returning_list["defense_points"],100) - returning_list["star_level"] = GetStarLevel(returning_list["power"]) + returning_list["star_level"] = GetStarLevel(returning_list["power"],returning_list["attack_points"],returning_list["defense_points"]) return returning_list diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm index 71166d11d3d..2ca5519167a 100644 --- a/code/controllers/subsystems/job.dm +++ b/code/controllers/subsystems/job.dm @@ -351,6 +351,7 @@ var/obj/S = get_roundstart_spawnpoint(rank) if(istype(S, /obj/effect/landmark/start) && istype(S.loc, /turf)) H.forceMove(S.loc) + H.lastarea = get_area(H.loc) else LateSpawn(H, rank) diff --git a/code/game/antagonist/antagonist_place.dm b/code/game/antagonist/antagonist_place.dm index 11ea718f8cc..fa320c7395c 100644 --- a/code/game/antagonist/antagonist_place.dm +++ b/code/game/antagonist/antagonist_place.dm @@ -25,3 +25,4 @@ return var/turf/T = pick_mobless_turf_if_exists(starting_locations) mob.forceMove(T) + mob.lastarea = get_area(mob.loc) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index a24a1a89fb9..023ac782564 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -181,51 +181,10 @@ var/list/sacrificed = list() var/choice = alert(target,"Do you want to join the cult?","Submit to Nar'Sie","Resist","Submit") waiting_for_input[target] = 0 if(choice == "Submit") //choosing 'Resist' does nothing of course. - if(!target.is_mechanical()) - cult.add_antagonist(target.mind) - converting -= target - target.hallucination = 0 //sudden clarity - sound_to(target, 'sound/effects/bloodcult.ogg') - else - converting -= target - //If we are dealing with a IPC then ask the caster what construct they want - var/construct_class = alert(attacker, "Please choose which type of construct you wish to create.",,"Juggernaut","Wraith","Artificer") - - sound_to(target, 'sound/effects/bloodcult.ogg') - - //Spawn some remains - new target.species.remains_type(target.loc) //spawns a skeleton based on the species remain type - target.invisibility = 101 - var/atom/movable/overlay/animation = new /atom/movable/overlay( target.loc ) - animation.icon_state = "blank" - animation.icon = 'icons/mob/mob.dmi' - animation.master = target - flick("dust-h", animation) - qdel(animation) - - //Spawn the selected construct - switch(construct_class) - if("Juggernaut") - var/mob/living/simple_animal/construct/armoured/Z = new /mob/living/simple_animal/construct/armoured (get_turf(target.loc)) - Z.key = target.key - qdel(target) - cult.add_antagonist(Z.mind) - Z << "You are playing a Juggernaut. Though slow, you can withstand extreme punishment, and rip apart enemies and walls alike." - Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." - if("Wraith") - var/mob/living/simple_animal/construct/wraith/Z = new /mob/living/simple_animal/construct/wraith (get_turf(target.loc)) - Z.key = target.key - qdel(target) - cult.add_antagonist(Z.mind) - Z << "You are playing a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls." - Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." - if("Artificer") - var/mob/living/simple_animal/construct/builder/Z = new /mob/living/simple_animal/construct/builder (get_turf(target.loc)) - Z.key = target.key - qdel(target) - cult.add_antagonist(Z.mind) - Z << "You are playing an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, repair allied constructs (by clicking on them), and even create new constructs" - Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." + cult.add_antagonist(target.mind) + converting -= target + target.hallucination = 0 //sudden clarity + sound_to(target, 'sound/effects/bloodcult.ogg') sleep(100) //proc once every 10 seconds return 1 diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index fbe20de489a..d888dedaa18 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -88,6 +88,8 @@ // Parameters: None // Description: Closes the door. No checks are done inside this proc. /obj/machinery/door/blast/proc/force_close() + if(density) + return 0 src.operating = 1 src.layer = closed_layer flick(icon_state_closing, src) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 8bddbef8585..c5dd4ff48f2 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -755,7 +755,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co photo_data.photo.forceMove(src.loc) if(!issilicon(user)) user.put_in_inactive_hand(photo_data.photo) - qdel(photo_data) + QDEL_NULL(photo_data) if(istype(user.get_active_hand(), /obj/item/weapon/photo)) var/obj/item/photo = user.get_active_hand() diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 470df5f1dbb..23df571ff4f 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -627,6 +627,7 @@ /obj/item/weapon/storage/toolbox/lunchbox/syndicate = 2 ) restock_items = 1 + random_itemcount = 0 /obj/machinery/vending/sovietsoda name = "BODA" @@ -701,6 +702,7 @@ /obj/item/weapon/storage/belt/utility = 3 ) restock_items = 1 + random_itemcount = 0 /obj/machinery/vending/tacticool //Tried not to go overboard with the amount of fun security has access to. name = "Tactical Express" @@ -875,16 +877,16 @@ ) prices = list( /obj/item/weapon/book/manual/battlemonsters = 12, - /obj/item/battle_monsters/wrapped = 150, - /obj/item/battle_monsters/wrapped/pro = 100, - /obj/item/battle_monsters/wrapped/species = 150, - /obj/item/battle_monsters/wrapped/species/lizard = 150, - /obj/item/battle_monsters/wrapped/species/cat = 150, - /obj/item/battle_monsters/wrapped/species/ant = 150, + /obj/item/battle_monsters/wrapped = 100, + /obj/item/battle_monsters/wrapped/pro = 75, + /obj/item/battle_monsters/wrapped/species = 100, + /obj/item/battle_monsters/wrapped/species/lizard = 125, + /obj/item/battle_monsters/wrapped/species/cat = 125, + /obj/item/battle_monsters/wrapped/species/ant = 125, /obj/item/battle_monsters/wrapped/rare = 200 ) contraband = list( - /obj/item/battle_monsters/wrapped/legendary = 2 + /obj/item/battle_monsters/wrapped/legendary = 4 ) premium = list( /obj/item/weapon/coin/battlemonsters = 10 diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index d816ff413c3..a87a0cd4c28 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1850,8 +1850,6 @@ if (prob(probability)) internal_tank_valve = rand(0,10000) // Screw up the cabin air pressure. //This will probably kill the pilot if they dont check it before climbing in - if (prob(probability)) - state = 1 // Enable maintenance mode. It won't move. if (prob(probability)) use_internal_tank = !use_internal_tank // Flip internal tank mode on or off if (prob(probability)) @@ -1864,6 +1862,9 @@ radio.set_frequency(rand(1200,1600)) if (prob(probability)) maint_access = 0 // Disallow maintenance mode + else + maint_access = 1 // Explicitly allow maint_access -> Othwerwise we have a stuck mech, as you cant change the state back, if maint_access is 0 + state = 1 // Enable maintenance mode. It won't move. ///////////////////////////////////////// //////// Mecha process() helpers //////// diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 6b8d1555ef1..1e78c3d10d6 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -175,20 +175,7 @@ desc = "It's a Vaurca cloak, with paltry storage options." icon_state = "cape" max_storage_space = 12 - -/obj/item/weapon/storage/backpack/cloak/mob_can_equip(mob/user) - - if (!..()) - return 0 - - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if (H.species.get_bodytype() == "Vaurca") - item_state = "vaurcacape" - else - item_state = "cape" - - return 1 + sprite_sheets = list("Vaurca" = 'icons/mob/species/vaurca/back.dmi') /obj/item/weapon/storage/backpack/syndie name = "syndicate rucksack" diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 11cccfbcfe7..890ab84cc0f 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -299,14 +299,14 @@ /obj/item/weapon/storage/fancy/chocolate_box icon = 'icons/obj/chocolate.dmi' icon_state = "chocolatebox" - icon_type = "chocolatebox" + icon_type = "chocolate" name = "chocolate box" storage_slots = 8 can_hold = list( - /obj/item/weapon/reagent_containers/food/snacks + /obj/item/weapon/reagent_containers/food/snacks/truffle/random ) /obj/item/weapon/storage/fancy/chocolate_box/fill() for(var/i=1; i <= storage_slots; i++) - new /obj/item/weapon/reagent_containers/food/snacks/random(src) + new /obj/item/weapon/reagent_containers/food/snacks/truffle/random(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 26ed3503e9f..ac556348821 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -56,10 +56,13 @@ else user.drop_item() else if(W.GetID()) + if(user.loc == src) + to_chat(user, "You can't reach the lock from inside.") + return var/obj/item/weapon/card/id/I = W.GetID() if(broken) - user << "It appears to be broken." + to_chat(user, "It appears to be broken.") return if(!I || !I.registered_name) return if(allowed(user) || !registered_name || (istype(I) && (registered_name == I.registered_name))) @@ -72,14 +75,14 @@ registered_name = I.registered_name desc = "Owned by [I.registered_name]." else - user << "Access Denied" + to_chat(user, "Access Denied") else if(istype(W, /obj/item/weapon/melee/energy/blade)) if(emag_act(INFINITY, user, "The locker has been sliced open by [user] with \an [W]!", "You hear metal being sliced and sparks flying.")) W:spark_system.queue() playsound(loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(loc, "sparks", 50, 1) else - user << "Access Denied" + to_chat(user, "Access Denied") return /obj/structure/closet/secure_closet/personal/emag_act(var/remaining_charges, var/mob/user, var/visual_feedback, var/audible_feedback) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index b4284df6b81..dad52f452bc 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -50,13 +50,13 @@ /obj/structure/closet/secure_closet/proc/togglelock(mob/user as mob) if(opened) - user << "Close the locker first." + to_chat(user, "Close the locker first.") return if(broken) - user << "The locker appears to be broken." + to_chat(user, "The locker appears to be broken.") return if(user.loc == src) - user << "You can't reach the lock from inside." + to_chat(user, "You can't reach the lock from inside.") return if(allowed(user)) locked = !locked @@ -65,7 +65,7 @@ O << "The locker has been [locked ? null : "un"]locked by [user]." update_icon() else - user << "Access Denied" + to_chat(user, "Access Denied") /obj/structure/closet/secure_closet/proc/CanChainsaw(var/obj/item/weapon/material/twohanded/chainsaw/ChainSawVar) return (ChainSawVar.powered && !opened && !broken) @@ -77,7 +77,7 @@ if(large) MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet else - user << "The locker is too small to stuff [G.affecting] into!" + to_chat(user, "The locker is too small to stuff [G.affecting] into!") if(iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if(WT.isOn()) @@ -90,7 +90,7 @@ if (!do_after(user, 2 SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_open))) return if(!WT.remove_fuel(0,user)) - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") return else new /obj/item/stack/material/steel(loc) @@ -110,33 +110,33 @@ user.drop_item() else if(isscrewdriver(W) && canbemoved) if(screwed) - user << "You start to unscrew the locker from the floor..." + to_chat(user, "You start to unscrew the locker from the floor...") playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) if (do_after(user, 10 SECONDS, act_target = src)) - user << "You unscrew the locker!" + to_chat(user, "You unscrew the locker!") playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) screwed = 0 else if(!screwed && wrenched) - user << "You start to screw the locker to the floor..." + to_chat(user, "You start to screw the locker to the floor...") playsound(src, 'sound/items/Welder.ogg', 80, 1) if (do_after(user, 15, act_target = src)) - user << "You screw the locker!" + to_chat(user, "You screw the locker!") playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) screwed = 1 else if(iswrench(W) && canbemoved) if(wrenched && !screwed) - user << "You start to unfasten the bolts holding the locker in place..." + to_chat(user, "You start to unfasten the bolts holding the locker in place...") playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if (do_after(user, 15 SECONDS, act_target = src)) - user << "You unfasten the locker's bolts!" + to_chat(user, "You unfasten the locker's bolts!") playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) wrenched = 0 anchored = 0 else if(!wrenched) - user << "You start to fasten the bolts holding the locker in place..." + to_chat(user, "You start to fasten the bolts holding the locker in place...") playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if (do_after(user, 15, act_target = src)) - user << "You fasten the locker's bolts!" + to_chat(user, "You fasten the locker's bolts!") playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) wrenched = 1 anchored = 1 @@ -175,7 +175,7 @@ if (!do_after(user, 2 SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_closed))) return if(!WT.remove_fuel(0,user)) - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") return welded = !welded update_icon() diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index 823e70e8e9a..79f3bd9a8ad 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -26,6 +26,10 @@ toggle() ..() +/obj/structure/curtain/attack_ai(mob/user) + if(istype(user, /mob/living/silicon/robot) && Adjacent(user)) // Robots can open/close it, but not the AI. + attack_hand(user) + /obj/structure/curtain/proc/toggle() src.set_opacity(!src.opacity) if(opacity) diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index a375a392a57..31470e325b6 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -66,6 +66,10 @@ var/list/admin_ranks = list() //list of all ranks with associated rights C.holder = null admins.Cut() + // Clears admins from the world config. + for (var/A in world.GetConfig("admin")) + world.SetConfig("APP/admin", A, null) + if(config.admin_legacy_system) load_admin_ranks() diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index b415807e765..50c708880cd 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -431,6 +431,7 @@ var/list/admin_verbs_cciaa = list( admin_verbs_spawn, debug_verbs ) + add_aooc_if_necessary() /client/proc/hide_most_verbs()//Allows you to keep some functionality while hiding some verbs set name = "Adminverbs - Hide Most" diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index 2666bfe1cc4..22d91f612c2 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -33,6 +33,9 @@ var/list/admin_datums = list() rights = initial_rights admin_datums[ckey] = src + if (rights & R_DEBUG) + world.SetConfig("APP/admin", ckey, "role=admin") + /datum/admins/proc/associate(client/C) if(istype(C)) owner = C diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 4125881b7c5..7c8595295a2 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -21,7 +21,7 @@ if (istype(src.loc,/obj/item/device/assembly_holder)) if (istype(src.loc.loc, /obj/structure/reagent_dispensers/fueltank/)) var/obj/structure/reagent_dispensers/fueltank/tank = src.loc.loc - if (tank && tank.modded) + if (tank && tank.is_leaking) tank.ex_act(3.0) spark(src, 4, cardinal) diff --git a/code/modules/battlemonsters/datum_titles.dm b/code/modules/battlemonsters/datum_titles.dm index ddd6544b107..7e5cab4b319 100644 --- a/code/modules/battlemonsters/datum_titles.dm +++ b/code/modules/battlemonsters/datum_titles.dm @@ -32,7 +32,7 @@ power_add = BATTLE_MONSTERS_POWER_UPGRADE power_mul = 1.25 description = "%NAME is feared upon by most lesser beings, and with good reason. A single stroke of their %WEAPON_AND is known to destroy the very souls of those unlucky enough to even witness it's power over %ELEMENT_AND." - special_effects = "Absolute Power: %NAME cannot be attacked by monsters with a base attack rating less than 2000." + special_effects = "Absolute Power: %NAME cannot be attacked by monsters with 4 or lower stars." rarity = 0.5 rarity_score = 1 diff --git a/code/modules/battlemonsters/items/deck.dm b/code/modules/battlemonsters/items/deck.dm index b0aa2d30ffb..d3b3430baa5 100644 --- a/code/modules/battlemonsters/items/deck.dm +++ b/code/modules/battlemonsters/items/deck.dm @@ -74,7 +74,7 @@ user.visible_message(\ span("notice","\The [user] combines two decks together."),\ - span("notice","You combine too decks together.")\ + span("notice","You combine two decks together.")\ ) qdel(C) @@ -150,12 +150,12 @@ if(icon_state != "hand") user.visible_message(\ span("notice","\The [usr] begins searching through \the [src]..."),\ - span("notice","You begin searching through your deck..")\ + span("notice","You begin searching through your deck...")\ ) - if(!do_after(user, 40, act_target = src)) + if(!do_after(user, 5 + stored_card_names.len, act_target = src)) user.visible_message(\ span("notice","\The [usr] stops and thinks better of it."),\ - span("notice","You top and think better of it.")\ + span("notice","You stop and think better of it.")\ ) return @@ -187,4 +187,3 @@ if(href_list["selection"]) take_specific_card(usr, href_list["selection"]) BrowseDeck(usr) - diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 0a31e19eda2..75b97c1706c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -192,7 +192,7 @@ pants["blue track pants"] = /obj/item/clothing/under/pants/track/blue pants["green track pants"] = /obj/item/clothing/under/pants/track/green pants["white track pants"] = /obj/item/clothing/under/pants/track/white - pants["red track pants"] = /obj/item/clothing/under/pants/track/blue + pants["red track pants"] = /obj/item/clothing/under/pants/track/red pants["camo pants"] = /obj/item/clothing/under/pants/camo pants["athletic shorts, black"] = /obj/item/clothing/under/shorts pants["athletic shorts, red"] = /obj/item/clothing/under/shorts/red diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 45a7c8b124d..74057758357 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -202,10 +202,5 @@ icon_state = "fingerlessgloves" item_state = "fingerlessgloves" fingerprint_chance = 100 - -/obj/item/clothing/gloves/fingerless/attackby(obj/item/weapon/W, mob/user) - if(iswirecutter(W) || istype(W, /obj/item/weapon/scalpel)) - user << "What do you plan to snip?" //Nope - return - ..() - + clipped = 1 + species_restricted = list("exclude","Golem","Vaurca Breeder","Vaurca Warform") \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/void/merc.dm b/code/modules/clothing/spacesuits/void/merc.dm index fd18886b99d..d50698f4236 100644 --- a/code/modules/clothing/spacesuits/void/merc.dm +++ b/code/modules/clothing/spacesuits/void/merc.dm @@ -10,7 +10,7 @@ ) armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60) siemens_coefficient = 0.3 - species_restricted = list("Human", "Vaurca", "Machine", "Heavy Machine") + species_restricted = list("Human", "Vaurca", "Machine", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") camera_networks = list(NETWORK_MERCENARY) light_overlay = "helmet_light_green" //todo: species-specific light overlays brightness_on = 6 @@ -30,4 +30,4 @@ armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60) allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs) siemens_coefficient = 0.3 - species_restricted = list("Human", "Skrell", "Vaurca", "Machine", "Heavy Machine") + species_restricted = list("Human", "Skrell", "Vaurca", "Machine", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index f73b618065d..a399c669df1 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -10,7 +10,7 @@ siemens_coefficient = 0.4 //Species-specific stuff. - species_restricted = list("Human", "Machine") + species_restricted = list("Human", "Machine", "Bishop Accessory Frame") sprite_sheets_refit = list( "Unathi" = 'icons/mob/species/unathi/helmet.dmi', "Tajara" = 'icons/mob/species/tajaran/helmet.dmi', @@ -38,7 +38,7 @@ max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.4 - species_restricted = list("Human", "Skrell", "Machine") + species_restricted = list("Human", "Skrell", "Machine", "Bishop Accessory Frame") sprite_sheets_refit = list( "Unathi" = 'icons/mob/species/unathi/suit.dmi', "Tajara" = 'icons/mob/species/tajaran/suit.dmi', diff --git a/code/modules/clothing/spacesuits/void/wizard.dm b/code/modules/clothing/spacesuits/void/wizard.dm index fd6acc82247..4922cd8d9f3 100644 --- a/code/modules/clothing/spacesuits/void/wizard.dm +++ b/code/modules/clothing/spacesuits/void/wizard.dm @@ -11,7 +11,7 @@ armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60) siemens_coefficient = 0.3 wizard_garb = 1 - species_restricted = list("Human", "Machine", "Heavy Machine", "Skeleton") + species_restricted = list("Human", "Machine", "Heavy Machine", "Skeleton", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") /obj/item/clothing/head/helmet/space/void/wizard/equipped(var/mob/living/user) if(!user.is_wizard()) @@ -47,7 +47,7 @@ siemens_coefficient = 0.3 wizard_garb = 1 allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/teleportation_scroll,/obj/item/weapon/scrying,/obj/item/weapon/spellbook,/obj/item/device/soulstone,/obj/item/weapon/material/knife/ritual) - species_restricted = list("Human", "Skrell", "Machine", "Heavy Machine", "Skeleton") + species_restricted = list("Human", "Skrell", "Machine", "Heavy Machine", "Skeleton", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") /obj/item/clothing/suit/space/void/wizard/equipped(var/mob/living/user) if(!user.is_wizard()) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index c8bc1582081..1c63ce7621f 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -2374,7 +2374,7 @@ obj/item/clothing/suit/storage/hooded/fluff/make_poncho //Raincoat Poncho - M.A. can_nap = 0 -/obj/item/clothing/suit/storage/toggle/fluff/talon_coat //Embroidered Coat - Talon Hatfield - dronztheWolf +/obj/item/clothing/suit/storage/toggle/fluff/talon_coat //Embroidered Coat - Talon Hatfield - dronzthewolf name = "embroidered coat" desc = " Martian long coat, made to fend off dust storms and other unpleasantries. This one has a few patches sewn into it depicting: A Solarian flag, a Batallion number, and a large sun." icon = 'icons/obj/custom_items/talon_coat.dmi' @@ -2382,4 +2382,21 @@ obj/item/clothing/suit/storage/hooded/fluff/make_poncho //Raincoat Poncho - M.A. item_state = "talon_coat" icon_open = "talon_coat_open" icon_closed = "talon_coat" + contained_sprite = TRUE + + +/obj/item/weapon/storage/backpack/cloak/fluff/ryn_cloak //Security Tunnel Cloak - Za'Akaix'Ryn Zo'ra - jamchop23334 + name = "security tunnel cloak" + desc = "A blue, tailor-made tunnel cloak with paltry storage options. The fabric is smoother and less abrasive than regular tunnel cloaks, though it looks difficult to wear." + icon = 'icons/obj/custom_items/ryn_clothing.dmi' + icon_state = "ryn_cloak" + item_state = "ryn_cloak" + contained_sprite = TRUE + +/obj/item/clothing/head/fluff/ryn_hood //Security Tunnel Hood - Za'Akaix'Ryn Zo'ra - jamchop23334 + name = "security tunnel hood" + desc = "A silky smooth blue hood, though its more of a headwrap. You're having a hard time wrapping your head around how to wear this." + icon = 'icons/obj/custom_items/ryn_clothing.dmi' + icon_state = "ryn_hood" + item_state = "ryn_hood" contained_sprite = TRUE \ No newline at end of file diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 04b2b4b1958..55da98023aa 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -68,13 +68,13 @@ log transactions break /obj/machinery/atm/emag_act(var/remaining_charges, var/mob/user) - if(!emagged) + if(emagged) return //short out the machine, shoot sparks, spew money! emagged = 1 spark(src, 5, alldirs) - spawn_money(rand(100,500),src.loc) + spawn_money(rand(2000,5000),src.loc) //we don't want to grief people by locking their id in an emagged ATM release_held_id(user) @@ -85,7 +85,7 @@ log transactions /obj/machinery/atm/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/weapon/card)) - if(emagged > 0) + if(emagged) //prevent inserting id into an emagged ATM user << "\icon[src] CARD READER ERROR. This system has been compromised!" return @@ -135,7 +135,7 @@ log transactions dat += "For all your monetary needs!
" dat += "This terminal is [machine_id]. Report this code when contacting IT Support
" - if(emagged > 0) + if(emagged) dat += "Card: LOCKED

Unauthorized terminal access detected! This ATM has been locked. Please contact IT Support." else dat += "Card: [held_card ? held_card.name : "------"]

" @@ -428,7 +428,7 @@ log transactions if("insert_card") if(!held_card) //this might happen if the user had the browser window open when somebody emagged it - if(emagged > 0) + if(emagged) usr << "\icon[src] The ATM card reader rejected your ID because this machine has been sabotaged!" else var/obj/item/I = usr.get_active_hand() diff --git a/code/modules/mob/living/bot/ed209bot.dm b/code/modules/mob/living/bot/ed209bot.dm index aabe2fd2160..8ff5ce85791 100644 --- a/code/modules/mob/living/bot/ed209bot.dm +++ b/code/modules/mob/living/bot/ed209bot.dm @@ -266,6 +266,9 @@ qdel(src) /mob/living/bot/secbot/ed209/RangedAttack(var/atom/A) + if(!(target in view(7, src))) + walk_to(src, target, 6, move_to_delay) + return if(last_shot + shot_delay > world.time) src << "You are not ready to fire yet!" return diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm index 594a83223a2..817df888312 100644 --- a/code/modules/mob/living/bot/secbot.dm +++ b/code/modules/mob/living/bot/secbot.dm @@ -80,6 +80,7 @@ /mob/living/bot/secbot/turn_off() ..() + walk_to(src, src, 0, move_to_delay) target = null frustration = 0 mode = SECBOT_IDLE diff --git a/code/modules/mob/living/carbon/diona_base.dm b/code/modules/mob/living/carbon/diona_base.dm index 280a545ea78..1234820d47b 100644 --- a/code/modules/mob/living/carbon/diona_base.dm +++ b/code/modules/mob/living/carbon/diona_base.dm @@ -8,8 +8,8 @@ #define NYMPH_ABSORB_NUTRITION 650 #define NYMPH_ABSORB_DEAD_FACTOR 0.3 -#define REGROW_FOOD_REQ 100 -#define REGROW_ENERGY_REQ 40 +#define REGROW_FOOD_REQ 150 +#define REGROW_ENERGY_REQ 60 #define LANGUAGE_POINTS_TO_LEARN 3 //The number of samples of a language required to learn it @@ -118,12 +118,9 @@ var/list/diona_banned_languages = list( //Most medicines don't work on diona, but physical treatment for external wounds helps a little, //and some alternative things that are toxic to other life, such as radium and mutagen, will benefit diona /mob/living/carbon/proc/diona_handle_regeneration(var/datum/dionastats/DS) - if ((DS.stored_energy < 1 && !total_radiation)) //we need energy or radiation to heal + if ((DS.stored_energy < 1 && !total_radiation)) //we need energy or total_radiation to heal return FALSE - var/radiation = max(total_radiation, 0) - - var/value //A little variable we'll reuse to optimise var/CL //Cached loss, to save on repeatedly recalculating it var/HF = DS.healing_factor //I don't know if fetching a variable from an object repeatedly is slow, but this seems safe @@ -134,10 +131,10 @@ var/list/diona_banned_languages = list( if (getHalLoss() > 0) CL = getHalLoss() if (CL > 0) - if (radiation > 0) - value = min(CL, radiation, 2*HF) + if (total_radiation > 0) + value = min(CL, total_radiation, 2*HF) adjustHalLoss(value*-3,1) //Halloss heals more quickly - radiation -= value + total_radiation -= value CL = getHalLoss() value = min(CL, DS.stored_energy, 1*HF) @@ -151,10 +148,10 @@ var/list/diona_banned_languages = list( CL = getBruteLoss() if (CL > 0) - if (radiation > 0) - value = min(CL, radiation, 2*HF) + if (total_radiation > 0) + value = min(CL, total_radiation, 2*HF) adjustBruteLoss(value*-1) - radiation -= value + total_radiation -= value CL = getBruteLoss() //After adjusting it, recalculate for the lighthealing value = min(CL, DS.stored_energy, 1*HF) @@ -163,10 +160,10 @@ var/list/diona_banned_languages = list( CL = getFireLoss() if (CL > 0) - if (radiation > 0) - value = min(CL, radiation, 2*HF) + if (total_radiation > 0) + value = min(CL, total_radiation, 2*HF) adjustFireLoss(value*-1) - radiation -= value + total_radiation -= value CL = getFireLoss() value = min(CL, DS.stored_energy, 1*HF) @@ -175,10 +172,10 @@ var/list/diona_banned_languages = list( CL = stunned if (CL > 0) - if (radiation > 0) - value = min(CL, radiation, 2*HF) + if (total_radiation > 0) + value = min(CL, total_radiation, 2*HF) stunned -= value - radiation -= value + total_radiation -= value CL = stunned value = min(CL, DS.stored_energy, 1*HF) @@ -188,10 +185,10 @@ var/list/diona_banned_languages = list( CL = weakened if (CL > 0) - if (radiation > 0) - value = min(CL, radiation, 2*HF) + if (total_radiation > 0) + value = min(CL, total_radiation, 2*HF) weakened -= value - radiation -= value + total_radiation -= value CL = weakened value = min(CL, DS.stored_energy, 1*HF) @@ -202,10 +199,10 @@ var/list/diona_banned_languages = list( if (life_tick % LIFETICK_INTERVAL_LESS == 0) CL = getToxLoss() if (CL > 0) - if (radiation > 0) - value = min(CL, radiation, 2*HF*LIFETICK_INTERVAL_LESS) + if (total_radiation > 0) + value = min(CL, total_radiation, 2*HF*LIFETICK_INTERVAL_LESS) adjustToxLoss(value*-1) - radiation -= value + total_radiation -= value CL = getToxLoss() value = min(CL, DS.stored_energy, 1*HF*LIFETICK_INTERVAL_LESS) @@ -215,10 +212,10 @@ var/list/diona_banned_languages = list( CL = getCloneLoss() if (CL > 0) - if (radiation > 0) - value = min(CL, radiation, 2*HF*LIFETICK_INTERVAL_LESS) + if (total_radiation > 0) + value = min(CL, total_radiation, 2*HF*LIFETICK_INTERVAL_LESS) adjustCloneLoss(value/-2.5) //Genetic damage, should diona ever suffer it, heals much more slowly. - radiation -= value //Most likely the only time they'll cloneloss is escaping from being partially devoured + total_radiation -= value //Most likely the only time they'll cloneloss is escaping from being partially devoured CL = getCloneLoss() value = min(CL, DS.stored_energy, 1*HF*LIFETICK_INTERVAL_LESS) @@ -229,21 +226,15 @@ var/list/diona_banned_languages = list( updatehealth() return FALSE - // A little inter-proc communication. - // We need the continued radiation count for the sake of actually working. - return max(radiation, 0) - // Continuation of the Diona regen proc, but for human specific actions. /mob/living/carbon/human/diona_handle_regeneration(var/datum/dionastats/DS) - . = ..() + ..() // We cancel with regening organ, as it's meant to stop all other regenerative // processes. Just pray to shit the timers don't implode. - if (!. || DS.regening_organ) + if ((!total_radiation && !DS.healing_factor && !DS.stored_energy) || DS.regening_organ) return FALSE - var/radiation = . - //Next up, healing any damage to internal organs. //Diona really only have one critical organ, the light receptor node in the head. //If badly damaged, the light receptor reduces the effectiveness of incoming light @@ -253,10 +244,10 @@ var/list/diona_banned_languages = list( for (var/obj/item/organ/O in bad_internal_organs) var/CL = O.damage var/value - if (radiation > 0) - value = min(CL, radiation, 2 * DS.healing_factor * LIFETICK_INTERVAL_LESS) + if(total_radiation > 0) + value = min(CL, total_radiation, 2 * DS.healing_factor * LIFETICK_INTERVAL_LESS) O.damage += value/-1.5 - radiation -= value + total_radiation -= value CL = getCloneLoss() value = min(CL, DS.stored_energy, 1 * DS.healing_factor * LIFETICK_INTERVAL_LESS) @@ -426,7 +417,7 @@ var/list/diona_banned_languages = list( var/HP = 1 //HP = health-percentage if (DS.LMS == 4) if (HP < 0.6) - to_chat(src, "The darkness burns. Your nymphs decay and wilt You are in mortal danger!") + to_chat(src, "The darkness burns. Your nymphs decay and wilt. You are in mortal danger!") DS.LMS = 5 else if (DS.LMS == 5) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 150aa572535..87ed8151ec3 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -7,22 +7,35 @@ var/skipears = 0 var/skipeyes = 0 var/skipface = 0 + var/skipbody = 0 //exosuits and helmets obscure our view and stuff. if(wear_suit) + skipbody |= wear_suit.body_parts_covered skipgloves = wear_suit.flags_inv & HIDEGLOVES skipsuitstorage = wear_suit.flags_inv & HIDESUITSTORAGE skipjumpsuit = wear_suit.flags_inv & HIDEJUMPSUIT skipshoes = wear_suit.flags_inv & HIDESHOES if(head) + skipbody |= head.body_parts_covered + skipbody &= ~HEAD // head covering incorrectly hides 'face' damage + skipbody |= (skipbody & FACE) ? HEAD : 0 // if you hide face damage, however, then go ahead and hide head damage, since that's where face damage is skipmask = head.flags_inv & HIDEMASK skipeyes = head.flags_inv & HIDEEYES skipears = head.flags_inv & HIDEEARS skipface = head.flags_inv & HIDEFACE if(wear_mask) + skipbody |= wear_mask.body_parts_covered + skipbody |= (wear_mask.body_parts_covered & FACE) ? HEAD : 0 // same as above skipface |= wear_mask.flags_inv & HIDEFACE + + if(w_uniform) + skipbody |= w_uniform.body_parts_covered + + if(gloves) + skipbody |= gloves.body_parts_covered var/list/msg = list("*---------*\nThis is ") @@ -261,9 +274,11 @@ wound_flavor_text["[organ_descriptor]"] = "[T.He] [T.has] a stump where [T.his] [organ_descriptor] should be.\n" else continue - + for(var/obj/item/organ/external/temp in organs) if(temp) + if(skipbody & temp.body_part) + continue if(temp.status & ORGAN_ROBOT) if(!(temp.brute_dam + temp.burn_dam)) //wound_flavor_text["[temp.name]"] = "[T.He] [T.has] a robot [temp.name]!\n" diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 3a5aef1aca9..c5240184ccc 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -44,8 +44,8 @@ else if(E.status & ORGAN_BROKEN) tally += 1.5 - if(shock_stage >= 10) tally += 3 - + if (!(species && (species.flags & NO_PAIN))) + if(shock_stage >= 10) tally += 3 if(aiming && aiming.aiming_at) tally += 5 // Iron sights make you slower, it's a well-known fact. diff --git a/code/modules/mob/living/carbon/human/species/station/machine_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/machine_subspecies.dm index a1dc9b954a3..a261da1314e 100644 --- a/code/modules/mob/living/carbon/human/species/station/machine_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/machine_subspecies.dm @@ -274,7 +274,7 @@ examine_color = "#bc4b00" - blurb = "The Xion Manufacturing Group, being a subsidiary of Hephaestus Industries, saw the original Industrial models and wanted to develop their own chassis based off of the original design. The result is the Xion Industrial model. Sturdy and strong, this chassis is quite powerful and equally durable, with an ample power cell and improved actuators for carrying the increased weight of the body. The Xion model also retains sturdiness without covering the chassis in plating, allowing for the cooling systems to vent heat much easier than the Hephaestus-brand model. This unit cannot perform EVA" + blurb = "The Xion Manufacturing Group, being a subsidiary of Hephaestus Industries, saw the original Industrial models and wanted to develop their own chassis based off of the original design. The result is the Xion Industrial model. Sturdy and strong, this chassis is quite powerful and equally durable, with an ample power cell and improved actuators for carrying the increased weight of the body. The Xion model also retains sturdiness without covering the chassis in plating, allowing for the cooling systems to vent heat much easier than the Hephaestus-brand model. This unit cannot perform EVA without a suit." has_limbs = list( "chest" = list("path" = /obj/item/organ/external/chest/industrial/xion), diff --git a/code/modules/mob/living/carbon/human/unarmed_attack.dm b/code/modules/mob/living/carbon/human/unarmed_attack.dm index 5f7624a9bec..db035478335 100644 --- a/code/modules/mob/living/carbon/human/unarmed_attack.dm +++ b/code/modules/mob/living/carbon/human/unarmed_attack.dm @@ -94,6 +94,10 @@ var/global/list/sparring_attack_cache = list() /datum/unarmed_attack/proc/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) var/obj/item/organ/external/affecting = target.get_organ(zone) + + if(!affecting) + return + user.visible_message("[user] [pick(attack_verb)] [target] in the [affecting.name]!") playsound(user.loc, attack_sound, 25, 1, -1) @@ -131,6 +135,10 @@ var/global/list/sparring_attack_cache = list() /datum/unarmed_attack/punch/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) var/obj/item/organ/external/affecting = target.get_organ(zone) + + if(!affecting) + return + var/organ = affecting.name attack_damage = Clamp(attack_damage, 1, 5) // We expect damage input of 1 to 5 for this proc. But we leave this check juuust in case. @@ -203,6 +211,10 @@ var/global/list/sparring_attack_cache = list() /datum/unarmed_attack/kick/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) var/obj/item/organ/external/affecting = target.get_organ(zone) + + if(!affecting) + return + var/organ = affecting.name attack_damage = Clamp(attack_damage, 1, 5) @@ -246,7 +258,12 @@ var/global/list/sparring_attack_cache = list() /datum/unarmed_attack/stomp/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) var/obj/item/organ/external/affecting = target.get_organ(zone) + + if(!affecting) + return + var/organ = affecting.name + var/obj/item/clothing/shoes = user.shoes attack_damage = Clamp(attack_damage, 1, 5) diff --git a/code/modules/mob/living/carbon/metroid/life.dm b/code/modules/mob/living/carbon/metroid/life.dm index b5c8fb6c829..b795d150e73 100644 --- a/code/modules/mob/living/carbon/metroid/life.dm +++ b/code/modules/mob/living/carbon/metroid/life.dm @@ -281,6 +281,9 @@ /mob/living/carbon/slime/proc/handle_AI() // the master AI process + if(Victim && Victim.stat & DEAD) + Victim = null + if(stat == DEAD || client || Victim) return // If we're dead or have a client, we don't need AI, if we're feeding, we continue feeding AIproc = 1 diff --git a/code/modules/mob/living/carbon/taste.dm b/code/modules/mob/living/carbon/taste.dm index 592a141cb70..857f4c76e35 100644 --- a/code/modules/mob/living/carbon/taste.dm +++ b/code/modules/mob/living/carbon/taste.dm @@ -27,7 +27,7 @@ calculate text size per text. for(var/datum/reagent/R in reagent_list) if(!R.taste_mult) continue - if(R.id == "nutriment") //this is ugly but apparently only nutriment (not subtypes) has taste data TODO figure out why + if(R.id == "nutriment" || R.id == "synnutriment") //this is ugly but apparently only nutriment (not subtypes) has taste data TODO figure out why var/list/taste_data = R.get_data() for(var/taste in taste_data) if(taste in tastes) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 7d2d220053e..60d06899196 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -749,7 +749,6 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/weapon/gripper/chemistry(src) src.modules += new /obj/item/weapon/reagent_containers/dropper/industrial(src) src.modules += new /obj/item/device/reagent_scanner/adv(src) - src.modules += new /obj/item/weapon/extinguisher(src) src.modules += new /obj/item/weapon/storage/bag/plants(src) src.modules += new /obj/item/weapon/pen/robopen(src) src.emag = new /obj/item/weapon/hand_tele(src) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 04ba487ea65..260526548e7 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -3642,7 +3642,7 @@ color = "#102000" adj_temp = -5 adj_sleepy = -2 - caffeine = 1 + caffeine = 0.2 taste_description = "electric cherry" /datum/reagent/drink/zorasoda/phoron @@ -3652,7 +3652,7 @@ color = "#863333" adj_temp = -5 adj_sleepy = -2 - caffeine = 1 + caffeine = 0.2 taste_description = "electric grape" /datum/reagent/drink/zorasoda/kois @@ -3662,7 +3662,7 @@ color = "#dcd9cd" adj_temp = -5 adj_sleepy = -2 - caffeine = 1 + caffeine = 0.2 taste_description = "sugary cabbage" /datum/reagent/drink/zorasoda/kois/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -3677,7 +3677,7 @@ color = "#365000" adj_temp = -5 adj_sleepy = -3 - caffeine = 2 + caffeine = 0.3 taste_description = "a full-body bite into an acidic lemon" /datum/reagent/drink/zorasoda/hozm/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -3694,7 +3694,7 @@ color = "#100800" adj_temp = -5 adj_sleepy = -3 - caffeine = 0.8 + caffeine = 0.1 taste_description = "fizzy nettles" /datum/reagent/drink/zorasoda/venomgrass/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -3709,7 +3709,7 @@ color = "#E78108" adj_temp = -5 adj_sleepy = -3 - caffeine = 1 + caffeine = 0.2 unaffected_species = IS_MACHINE taste_description = "orange cream" @@ -3725,7 +3725,7 @@ color = "#0000CD" adj_temp = -5 adj_sleepy = -3 - caffeine = 1 + caffeine = 0.2 taste_description = "flat raspberry" /datum/reagent/drink/zorasoda/cthur/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -3761,7 +3761,7 @@ color = "#FFFF00" adj_temp = -5 adj_sleepy = -3 - caffeine = 1 + caffeine = 0.2 taste_description = "a reassuring spectrum of color" /datum/reagent/drink/zorasoda/jelly/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 59817d50f1d..3173acebf90 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -5016,7 +5016,7 @@ name = "mystery chocolate truffle" desc = "Rich bite-sized chocolate with a mystery filling!" -/obj/item/weapon/reagent_containers/food/snacks/random/Initialize() +/obj/item/weapon/reagent_containers/food/snacks/truffle/random/Initialize() . = ..() var/reagent_string = pick(list("cream","cherryjelly","mint","frostoil","capsaicin","cream","coffee","milkshake")) reagents.add_reagent(reagent_string, 4) @@ -5105,7 +5105,7 @@ nutriment_desc = list("pizza crust" = 5, "tomato" = 5) nutriment_amt = 5 -/obj/item/weapon/reagent_containers/food/snacks/baconburger +/obj/item/weapon/reagent_containers/food/snacks/burger/bacon name = "bacon burger" desc = "The cornerstone of every nutritious breakfast, now with bacon!" icon_state = "hburger" diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 0fa04fd6ecd..415da0c9471 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -1,5 +1,5 @@ /obj/structure/reagent_dispensers - name = "Strange dispenser" + name = "strange dispenser" desc = "What the fuck is this?" icon = 'icons/obj/objects.dmi' icon_state = "watertank" @@ -128,7 +128,6 @@ icon_state = "weldtank" accept_any_reagent = FALSE amount_per_transfer_from_this = 10 - var/modded = 0 var/defuse = 0 var/armed = 0 var/obj/item/device/assembly_holder/rig = null @@ -140,7 +139,7 @@ /obj/structure/reagent_dispensers/fueltank/examine(mob/user) if(!..(user, 2)) return - if (modded) + if (is_leaking) user << "Fuel faucet is wrenched open, leaking the fuel!" if(rig) user << "There is some kind of device rigged to the tank." @@ -215,7 +214,7 @@ ..() /obj/structure/reagent_dispensers/fueltank/fire_act(datum/gas_mixture/air, temperature, volume) - if (modded) + if (is_leaking) ex_act(2.0) else if (temperature > T0C+500) ex_act(2.0) @@ -226,7 +225,7 @@ ex_act(2.0) /obj/structure/reagent_dispensers/peppertank - name = "Pepper Spray Refiller" + name = "pepper spray refiller" desc = "Refill pepper spray canisters." icon = 'icons/obj/objects.dmi' icon_state = "peppertank" @@ -240,7 +239,7 @@ reagents.add_reagent("condensedcapsaicin",capacity) /obj/structure/reagent_dispensers/water_cooler - name = "Water-Cooler" + name = "water-cooler" desc = "A machine that dispenses water to drink." amount_per_transfer_from_this = 5 icon = 'icons/obj/vending.dmi' @@ -268,6 +267,8 @@ user.visible_message("\The [user] unfastens the screws securing \the [src] to the floor.", "You unfasten the screws securing \the [src] to the floor.") anchored = 0 return + else + ..() /obj/structure/reagent_dispensers/beerkeg name = "beer keg" @@ -292,7 +293,7 @@ reagents.add_reagent("xuizijuice",capacity) /obj/structure/reagent_dispensers/virusfood - name = "Virus Food Dispenser" + name = "virus food dispenser" desc = "A dispenser of virus food." icon = 'icons/obj/objects.dmi' icon_state = "virusfoodtank" @@ -306,7 +307,7 @@ reagents.add_reagent("virusfood", capacity) /obj/structure/reagent_dispensers/acid - name = "Sulphuric Acid Dispenser" + name = "sulphuric acid dispenser" desc = "A dispenser of acid for industrial processes." icon = 'icons/obj/objects.dmi' icon_state = "acidtank" diff --git a/html/changelog.html b/html/changelog.html index a047d3c6e83..c5e2ca67af7 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,6036 +55,6137 @@ -->
- -

09 September 2018

-

BurgerBB updated:

- -

CodePanter updated:

- -

ParadoxSpace updated:

- - -

05 September 2018

-

BurgerBB updated:

- -

PoZe updated:

- - -

03 September 2018

-

BurgerBB updated:

- - -

02 September 2018

-

Alberyk updated:

- -

Alberyk, Kyres1 updated:

- -

Arrow768 updated:

- -

BurgerBB updated:

- -

Furrycactus updated:

- -

LordFowl updated:

- -

MoondancerPony updated:

- -

NortonDK updated:

- -

ParadoxSpace updated:

- -

PoZe updated:

- -

TheDocOct updated:

- -

ben10083 updated:

- - -

27 August 2018

-

BurgerBB updated:

- - -

26 August 2018

-

Skull132 updated:

- - -

25 August 2018

-

BurgerBB updated:

- - -

14 August 2018

-

Arrow768 updated:

- -

BurgerBB updated:

- - -

11 August 2018

-

BurgerBB updated:

- -

PoZe updated:

- -

flimango updated:

- - -

07 August 2018

-

BurgerBB updated:

- -

flimango updated:

- - -

06 August 2018

-

BurgerBB updated:

- -

Karolis2011 updated:

- - -

05 August 2018

-

Alberyk updated:

- -

Arrow768 updated:

- -

BurgerBB updated:

- -

Fire and Glory updated:

- -

Flamingo updated:

- -

Karolis2011 updated:

- -

LordFowl updated:

- -

ParadoxSpace updated:

- -

PoZe updated:

- -

TheDocOct updated:

- -

ben10083 updated:

- - -

04 August 2018

-

Ron updated:

- - -

29 July 2018

-

Alberyk updated:

- -

BurgerBB updated:

- -

Karolis2011 updated:

- - -

24 July 2018

-

Arrow768 updated:

- -

BurgerBB updated:

- -

PoZe updated:

- -

ben10083 updated:

- - -

22 July 2018

-

Alberyk updated:

- -

Arrow768 updated:

- -

BurgerBB updated:

- -

Kaedwuff updated:

- -

Karolis2011 updated:

- -

LordFowl updated:

- -

LordFowl, BygoneHero, Kyres1 updated:

- -

LordFowl, Loow, NursieKitty updated:

- -

MattAtlas updated:

- -

ParadoxSpace updated:

- -

PoZe updated:

- -

Skull132 updated:

- -

ben10083 updated:

- - -

17 July 2018

-

Alberyk updated:

- -

BurgerBB updated:

- -

PoZe updated:

- - -

14 July 2018

-

Alberyk updated:

- -

BurgerBB updated:

- -

PoZe updated:

- - -

27 June 2018

-

Arrow768 updated:

- - -

26 June 2018

-

Lohikar updated:

- -

PoZe updated:

- - -

24 June 2018

-

PoZe updated:

- - -

22 June 2018

-

Arrow768 updated:

- - -

20 June 2018

-

BurgerBB updated:

- - -

18 June 2018

-

Alberyk updated:

- -

Arrow768 updated:

- -

BurgerBB updated:

- -

Code - PoZe, Sprites - DronzTheWolf updated:

- -

Kaedwuff updated:

- -

LordFowl updated:

- -

LordRaven001 updated:

- -

MoondancerPony updated:

- -

PoZe updated:

- -

Scheveningen updated:

- -

ben10083 updated:

- - -

16 June 2018

-

Arrow768 updated:

- - -

10 June 2018

-

Arrow768 updated:

- - -

03 June 2018

-

BurgerBB updated:

- - -

29 May 2018

-

Kaedwuff updated:

- - -

28 May 2018

-

Kaedwuff updated:

- - -

25 May 2018

-

Arrow768 updated:

- -

LordFowl updated:

- -

PoZe updated:

- - -

22 May 2018

-

Arrow768 updated:

- -

Lohikar updated:

- - -

20 May 2018

-

BurgerBB updated:

- - -

17 May 2018

-

Kaedwuff updated:

- -

PoZe updated:

- - -

14 May 2018

-

BurgerBB updated:

- - -

13 May 2018

-

Alberyk updated:

- -

Arrow768 updated:

- -

Banditoz updated:

- -

BurgerBB updated:

- -

ParadoxSpace updated:

- -

PoZe updated:

- -

Skull132 updated:

- - -

10 May 2018

-

Kaedwuff updated:

- - -

07 May 2018

-

BurgerBB updated:

- -

PoZe updated:

- - -

25 April 2018

-

Alberyk updated:

- -

Arrow768 updated:

- - -

19 April 2018

-

PoZe updated:

- - -

15 April 2018

-

BurgerBB updated:

- -

Lohikar updated:

- - -

12 April 2018

-

Printer16 updated:

- - -

08 April 2018

-

Alberyk updated:

- -

Arrow768 updated:

- -

BurgerBB updated:

- -

Kaedwuff updated:

- -

LordFowl updated:

- -

ParadoxSpace updated:

- -

PoZe updated:

- -

Ron updated:

- -

Skull132 updated:

- -

TheGreatNacho updated:

- -

soryy708 updated:

- - -

06 April 2018

-

Printer16 updated:

- - -

31 March 2018

-

TheGreatNacho updated:

- - -

21 March 2018

-

BurgerBB updated:

- - -

18 March 2018

-

Alberyk updated:

- -

Skull132 updated:

- - -

13 March 2018

-

BurgerBB updated:

- - -

10 March 2018

-

Alberyk updated:

- -

Arrow768 updated:

- -

BurgerBB updated:

- -

Buterrobber202 updated:

- -

Ezuo updated:

- -

Juani2400 updated:

- -

Kaedwuff updated:

- -

Lohikar updated:

- -

LordFowl updated:

- -

PoZe, AndurilFlame updated:

- -

Skull132 updated:

- -

kevinz000 updated:

- - -

24 February 2018

-

BurgerBB updated:

- -

sdtwbaj updated:

- - -

11 February 2018

-

Lohikar updated:

- - -

04 February 2018

-

Alberyk updated:

- -

LordFowl updated:

- - -

31 January 2018

-

LordFowl updated:

- - -

29 January 2018

-

Alberyk updated:

- - -

28 January 2018

-

BurgerBB updated:

- - -

27 January 2018

-

AgentWhatever updated:

- -

Alberyk updated:

- -

Arrow768 updated:

- -

BRAINOS updated:

- -

BurgerBB updated:

- -

Chaoko99 updated:

- -

Ezuo updated:

- -

Lohikar updated:

- -

LordFowl updated:

- -

MattAtlas updated:

- -

Pacmandevil updated:

- -

Printer16 updated:

- -

Scheveningen updated:

- -

Skull132 updated:

- -

Synnono updated:

- -

WrongEnd updated:

- - -

14 January 2018

-

Lohikar updated:

- -

LordFowl updated:

- - -

30 December 2017

-

PoZe updated:

- - -

22 December 2017

-

Alberyk updated:

- -

LordFowl updated:

- - -

12 December 2017

-

Lohikar updated:

- -

PoZe updated:

- -

Skull132 updated:

- - -

08 December 2017

-

Lohikar updated:

- -

Santa updated:

- - -

30 November 2017

-

Alberyk updated:

- -

Lohikar updated:

- -

MoondancerPony updated:

- -

PoZe updated:

- - -

20 November 2017

-

Alberyk updated:

- -

Lohikar updated:

- - -

11 November 2017

-

TheGreatJorge updated:

- - -

05 November 2017

-

Chaoko99 updated:

- -

Karolis2011 updated:

- -

Printer16 updated:

- - -

30 October 2017

-

Alberyk updated:

- - -

29 October 2017

-

Skull132 updated:

- - -

28 October 2017

-

Alberyk updated:

- -

Chaoko99 updated:

- -

TheGreatJorge updated:

- - -

24 October 2017

-

Lohikar updated:

- - -

22 October 2017

-

Skull132 updated:

- - -

20 October 2017

-

Lohikar updated:

- -

MoondancerPony updated:

- - -

15 October 2017

-

AgentWhatever updated:

- -

Alberyk updated:

- -

Arrow768 updated:

- -

BRAINOS updated:

- -

Belsima updated:

- -

Chaoko99 updated:

- -

Ezuo updated:

- -

HetNeSS updated:

- -

Juani2400 updated:

- -

Karolis2011 updated:

- -

Lohikar updated:

- -

MoondancerPony updated:

- -

Pacmandevil updated:

- -

Printer16 updated:

- -

Scheveningen updated:

- -

SoundScopes updated:

- -

wraithcraft updated:

- - -

13 October 2017

-

Alberyk updated:

- -

Belsima updated:

- -

MoondancerPony updated:

- - -

17 September 2017

-

Skull132 updated:

- - -

14 September 2017

-

Lohikar updated:

- -

MoondancerPony updated:

- - -

09 September 2017

-

Ezuo updated:

- - -

06 September 2017

-

Skull132 updated:

- - -

05 September 2017

-

Lohikar updated:

- - -

27 August 2017

-

Printer16 updated:

- - -

23 August 2017

-

Lohikar updated:

- - -

15 August 2017

-

Lohikar updated:

- - -

13 August 2017

-

Lohikar updated:

- - -

07 August 2017

-

Lohikar updated:

- - -

05 August 2017

-

Alberyk updated:

- - -

04 August 2017

-

Lohikar updated:

- - -

03 August 2017

-

Skull132 updated:

- - -

02 August 2017

-

Lohikar updated:

- - -

31 July 2017

-

Lohikar updated:

- - -

27 July 2017

-

Lohikar updated:

- - -

25 July 2017

-

MoondancerPony updated:

- - -

24 July 2017

-

Lohikar updated:

- - -

23 July 2017

-

Lohikar updated:

- -

Skull132 updated:

- - -

21 July 2017

-

Alberyk updated:

- -

Skull132 updated:

- - -

20 July 2017

-

Lohikar updated:

- -

Skull132 updated:

- - -

18 July 2017

-

AgentWhatever updated:

- - -

16 July 2017

-

AgentWhatever updated:

- -

Alberyk updated:

- -

Arrow768 updated:

- -

Fire and Glory updated:

- -

HetNeSS updated:

- -

Lohikar updated:

- -

LordFowl updated:

- -

MoondancerPony updated:

- -

Nanako updated:

- -

Printer16 updated:

- -

Skull132 updated:

- -

Synnono updated:

- -

Wraithcraft updated:

- -

inselc updated:

- - -

15 June 2017

-

inselc updated:

- - -

13 June 2017

-

Nanako updated:

- - -

16 May 2017

-

Printer16 updated:

- - -

14 May 2017

-

Alberyk updated:

- - -

01 May 2017

-

Fire and Glory updated:

- -

Lohikar updated:

- - -

29 April 2017

-

Lohikar updated:

- -

LordFowl updated:

- - -

19 April 2017

-

Ccomp5950 updated:

- - -

14 April 2017

-

Lohikar updated:

- -

MoondancerPony updated:

- -

Nanako updated:

- - -

12 April 2017

-

MoondancerPony updated:

- - -

10 April 2017

-

Lohikar updated:

- -

MoondancerPony updated:

- - -

08 April 2017

-

MoondancerPony updated:

- -

Nanako updated:

- -

Printer16 updated:

- -

inselc updated:

- - -

03 April 2017

-

Lohikar updated:

- -

Nanako updated:

- - -

02 April 2017

-

Alberyk updated:

- -

Lohikar updated:

- - -

30 March 2017

-

Lohikar updated:

- - -

29 March 2017

-

Skull132 updated:

- - -

26 March 2017

-

Lohikar updated:

- - -

25 March 2017

-

inselc updated:

- - -

22 March 2017

-

Lohikar updated:

- -

Nanako updated:

- -

Skull132 updated:

- - -

19 March 2017

-

AgentWhatever updated:

- -

Alberyk updated:

- -

Arrow768 updated:

- -

Fire and Glory updated:

- -

Lohikar updated:

- -

LordFowl updated:

- -

Nanako updated:

- -

Printer16 updated:

- -

Skull132 updated:

- -

VikingPingvin updated:

- - -

14 March 2017

-

LordFowl updated:

- - -

05 March 2017

-

Skull132 updated:

- - -

17 February 2017

-

LordFowl updated:

- - -

10 February 2017

-

Alberyk updated:

- - -

07 February 2017

-

Lohikar updated:

- - -

03 February 2017

-

Alberyk updated:

- - -

30 January 2017

-

Lohikar updated:

- - -

29 January 2017

-

Alberky updated:

- - -

25 January 2017

-

Skull132 updated:

- - -

23 January 2017

-

Alberyk updated:

- - -

21 January 2017

-

Alberyk updated:

- -

Skull132 updated:

- - -

20 January 2017

-

Nanako updated:

- - -

19 January 2017

-

Alberyk updated:

- - -

15 January 2017

-

Lohikar updated:

- -

LordFowl updated:

- -

Nanako updated:

- - -

12 January 2017

-

Lohikar updated:

- -

Nanako updated:

- -

Skull132 updated:

- - -

11 January 2017

-

Alberyk updated:

- -

Nanako updated:

- - -

08 January 2017

-

Lohikar updated:

- - -

07 January 2017

-

Alberyk updated:

- -

Arrow768 updated:

- -

Bedshaped updated:

- -

Lohikar updated:

- -

LordFowl updated:

- -

Nanako updated:

- -

Printer16 updated:

- -

Serveris updated:

- -

Skull132 updated:

- - -

29 December 2016

-

Lohikar updated:

- - -

24 December 2016

-

Atlantis updated:

- -

Chinsky updated:

- -

Datraen updated:

- -

GinjaNinja32 updated:

- -

HarpyEagle updated:

- -

Hubblenaut updated:

- -

Karolis2011 updated:

- -

Kelenius updated:

- -

Loganbacca updated:

- -

Matthew951 updated:

- -

Neerti updated:

- -

Orelbon updated:

- -

PsiOmegaDelta updated:

- -

Raptor1628 updated:

- -

RavingManiac updated:

- -

Sligneris updated:

- -

Soadreqm updated:

- -

Techhead updated:

- -

TheWelp updated:

- -

Vivalas updated:

- -

Yoshax updated:

- -

Zuhayr updated:

- -

neersighted updated:

- - -

06 December 2016

-

Santa updated:

- - -

21 November 2016

-

Alberyk updated:

- - -

18 November 2016

-

Bedshaped updated:

- -

Nanako updated:

- - -

11 November 2016

-

Bedshaped updated:

- - -

09 November 2016

-

Nanako updated:

- -

Skull132 updated:

- - -

07 November 2016

-

Skull132 updated:

- - -

06 November 2016

-

Alberyk updated:

- -

Bedshaped updated:

- -

Fire and Glory updated:

- -

LordFowl updated:

- -

Nanako updated:

- -

OneOneThreeEight updated:

- -

inselc updated:

- - -

30 October 2016

-

inselc updated:

- - -

29 October 2016

-

inselc updated:

- - -

13 October 2016

-

Alberyk updated:

- - -

07 October 2016

-

Alberyk updated:

- - -

02 October 2016

-

Skull132 updated:

- - -

01 October 2016

-

Alberyk updated:

- -

Nanako updated:

- -

Skull132 updated:

- - -

28 September 2016

-

Alberyk updated:

- -

Bedshaped updated:

- - -

25 September 2016

-

Nanako updated:

- -

Skull132 updated:

- - -

21 September 2016

-

Bedshaped updated:

- - -

19 September 2016

-

Alberyk updated:

- -

Arrow768 updated:

- -

Bedshaped updated:

- -

Fire and Glory updated:

- -

Nadrew updated:

- -

Nanako updated:

- -

Skull132 updated:

- -

SoundScopes updated:

- - -

31 August 2016

-

Bedshaped updated:

- - -

25 August 2016

-

Bedshaped updated:

- -

Skull132 updated:

- - -

15 August 2016

-

Alberyk updated:

- -

Bedshaped updated:

- -

Nanako updated:

- -

Skull132 updated:

- - -

13 August 2016

-

Nanako updated:

- - -

12 August 2016

-

Nanako updated:

- - -

10 August 2016

-

Alberyk updated:

- -

Skull132 updated:

- - -

08 August 2016

-

Alberyk updated:

- -

Bedshaped updated:

- -

LordFowl updated:

- -

Nanako updated:

- -

Skull132 updated:

- -

alberyk updated:

- - -

03 August 2016

-

LordFowl updated:

- - -

24 July 2016

-

Alberyk updated:

- -

Bedshaped updated:

- -

LordFowl updated:

- - -

20 July 2016

-

Skull132 updated:

- - -

18 July 2016

-

Alberyk updated:

- -

Arrow768 updated:

- -

Bedshaped updated:

- -

Fire and Glory updated:

- -

Lord Lag updated:

- -

LordFowl updated:

- -

Nanako updated:

- -

Skull132 updated:

- - -

12 July 2016

-

LordFowl updated:

- - -

10 July 2016

-

Alberyk updated:

- -

LordFowl updated:

- - -

05 July 2016

-

Alberyk updated:

- -

Nanako updated:

- - -

29 June 2016

-

Skull132 updated:

- - -

27 June 2016

-

Nanako updated:

- - -

25 June 2016

-

LordFowl updated:

- - -

24 June 2016

-

LordFowl updated:

- -

Skull132 updated:

- - -

23 June 2016

-

Alberyk updated:

- -

Bedshaped updated:

- -

Nanako updated:

- -

Skull132 updated:

- - -

22 June 2016

-

Alberyk updated:

- -

Nanako updated:

- -

Skull132 updated:

- - -

20 June 2016

-

Arrow768 updated:

- -

LordFowl updated:

- - -

04 June 2016

-

Arrow768 updated:

- -

Skull132 updated:

- - -

01 June 2016

-

LordFowl updated:

- -

Skull132 updated:

- - -

31 May 2016

-

Nanako updated:

- - -

30 May 2016

-

Akrilla updated:

- -

Arrow768 updated:

- -

Brightdawn updated:

- -

Lord Lag updated:

- -

LordFowl updated:

- -

Skull132 updated:

- - -

25 March 2016

-

Lord Lag updated:

- -

Skull132 updated:

- - -

03 March 2016

-

Lord Lag updated:

- - -

21 February 2016

-

Skull132 updated:

- - -

16 February 2016

-

Skull132 updated:

- - -

15 February 2016

-

Lord Lag updated:

- - -

12 February 2016

-

Ryan784 updated:

- - -

01 February 2016

-

Lady of Ravens updated:

- -

Lord Lag updated:

- -

Mahzel updated:

- -

Ryan784 updated:

- -

Skull132 updated:

- - -

06 December 2015

-

Hubblenaut updated:

- - -

22 November 2015

-

neersighted updated:

- - -

27 October 2015

-

HarpyEagle updated:

- - -

14 October 2015

-

Hubblenaut updated:

- -

TheWelp updated:

- - -

10 October 2015

-

HarpyEagle updated:

- - -

11 September 2015

-

HarpyEagle updated:

- - -

05 September 2015

-

Zuhayr updated:

- - -

24 August 2015

-

HarpyEagle updated:

- -

Zuhayr updated:

- - -

17 August 2015

-

PsiOmegaDelta updated:

- - -

11 August 2015

-

PsiOmegaDelta updated:

- - -

31 July 2015

-

HarpyEagle updated:

- - -

29 July 2015

-

Karolis2011 updated:

- - -

27 July 2015

-

Kelenius updated:

- - -

14 July 2015

-

HarpyEagle updated:

- -

PsiOmegaDelta updated:

- - -

11 July 2015

-

HarpyEagle updated:

- -

Loganbacca updated:

- - -

10 July 2015

-

Zuhayr updated:

- - -

06 July 2015

-

GinjaNinja32 updated:

- - -

04 July 2015

-

PsiOmegaDelta updated:

- - -

30 June 2015

-

PsiOmegaDelta updated:

- - -

24 June 2015

-

HarpyEagle updated:

- - -

19 June 2015

-

HarpyEagle updated:

- - -

05 June 2015

-

PsiOmegaDelta updated:

- - -

04 June 2015

-

PsiOmegaDelta updated:

- - -

02 June 2015

-

Techhead updated:

- - -

30 May 2015

-

Atlantis updated:

- -

HarpyEagle updated:

- -

PsiOmegaDelta updated:

- - -

27 May 2015

-

PsiOmegaDelta updated:

- - -

22 May 2015

-

Ccomp5950 updated:

- -

Chinsky updated:

- -

HarpyEagle updated:

- -

Yoshax updated:

- -

Zuhayr updated:

- - -

18 May 2015

-

Hubblenaut updated:

- -

Kelenius updated:

- -

Loganbacca updated:

- -

PsiOmegaDelta updated:

- - -

17 May 2015

-

PsiOmegaDelta updated:

- - -

16 May 2015

-

GinjaNinja32 updated:

- -

HarpyEagle updated:

- - -

14 May 2015

-

PsiOmegaDelta updated:

- -

Techhead updated:

- - -

12 May 2015

-

Dennok updated:

- -

HarpyEagle updated:

- -

MrSnapwalk updated:

- -

PsiOmegaDelta updated:

- - -

11 May 2015

-

Mloc updated:

- -

PsiOmegaDelta updated:

- -

Techhead updated:

- - -

10 May 2015

-

GinjaNinja32 updated:

- -

Yoshax updated:

- - -

09 May 2015

-

Yoshax updated:

- - -

07 May 2015

-

HarpyEagle updated:

- -

PsiOmegaDelta updated:

- -

RavingManiac updated:

- - -

06 May 2015

-

PsiOmegaDelta updated:

- - -

05 May 2015

-

PsiOmegaDelta updated:

- -

RavingManiac updated:

- - -

02 May 2015

-

HarpyEagle updated:

- -

PsiOmegaDelta updated:

- -

Yoshax updated:

- - -

30 April 2015

-

Yoshax updated:

- - -

29 April 2015

-

Daranz updated:

- -

HarpyEagle updated:

- -

PsiOmegaDelta updated:

- - -

28 April 2015

-

Jarcolr updated:

- -

Kelenius updated:

- -

PsiOmegaDelta updated:

- -

RavingManiac updated:

- -

Yoshax updated:

- - -

24 April 2015

-

Dennok updated:

- - -

23 April 2015

-

Dennok updated:

- -

PsiOmegaDelta updated:

- -

Yoshax updated:

- - -

18 April 2015

-

PsiOmegaDelta updated:

- - -

07 April 2015

-

RavingManiac updated:

- - -

24 February 2015

-

Zuhayr updated:

- - -

18 February 2015

-

PsiOmegaDelta updated:

- - -

16 February 2015

-

RavingManiac updated:

- - -

12 February 2015

-

Daranz updated:

- - -

04 February 2015

-

RavingManiac updated:

- -

TwistedAkai updated:

- - -

09 January 2015

-

Zuhayr updated:

- - -

22 November 2014

-

Zuhayr updated:

- - -

08 November 2014

-

PsiOmegaDelta updated:

- - -

04 November 2014

-

TwistedAkai updated:

- - -

01 November 2014

-

PsiOmegaDelta updated:

- - -

01 October 2014

-

RavingManiac updated:

- -

Zuhayr updated:

- - -

28 September 2014

-

Gamerofthegame updated:

- -

Zuhayr updated:

- - -

20 September 2014

-

HarpyEagle updated:

- - -

05 September 2014

-

RavingManiac updated:

- - -

31 August 2014

-

Whitellama updated:

- - -

27 August 2014

-

Whitellama updated:

- - -

05 August 2014

-

HarpyEagle updated:

- - -

02 August 2014

-

Whitellama updated:

- - -

31 July 2014

-

HarpyEagle updated:

- - -

26 July 2014

-

Whitellama updated:

- - -

20 July 2014

-

PsiOmegaDelta updated:

- - -

06 July 2014

-

HarpyEagle updated:

- - -

01 July 2014

-

Various updated:

- - -

20 June 2014

-

Cael_Aislinn updated:

- - -

19 June 2014

-

Chinsky updated:

- - -

15 June 2014

-

HarpyEagle updated:

- - -

13 June 2014

-

HarpyEagle updated:

- - -

03 June 2014

-

Hubblenaut updated:

- - -

31 May 2014

-

Jarcolr updated:

- - -

28 May 2014

-

Chinsky updated:

- - -

23 May 2014

-

Hubble updated:

- - -

16 May 2014

-

HarpyEagle updated:

- - -

06 May 2014

-

Hubble updated:

- - -

03 May 2014

-

Cael_Aislinn updated:

- - -

29 April 2014

-

HarpyEagle updated:

- - -

25 April 2014

-

Various updated:

- - -

11 April 2014

-

Jarcolr updated:

- - -

06 April 2014

-

RavingManiac updated:

- - -

30 March 2014

-

RavingManiac updated:

- - -

10 March 2014

-

Chinsky updated:

- - -

05 March 2014

-

RavingManiac updated:

- - -

01 March 2014

-

Various updated:

- - -

19 February 2014

-

Aryn updated:

- - -

01 February 2014

-

Various updated:

- - -

01 January 2014

-

Various updated:

- - -

18 December 2013

-

RavingManiac updated:

- - -

01 December 2013

-

Various Developers banged their keyboards together: updated:

- - -

24 November 2013

-

Yinadele updated:

- - -

23 November 2013

-

Ccomp5950 updated:

- - -

01 November 2013

-

Various updated:

- - -

29 October 2013

-

Cael_Aislinn updated:

- - -

06 October 2013

-

Chinsky updated:

- - -

24 September 2013

-

Snapshot updated:

- - -

18 September 2013

-

Kilakk updated:

- - -

08 August 2013

-

Erthilo updated:

- - -

04 August 2013

-

Chinsky updated:

- - -

01 August 2013

-

Asanadas updated:

- -

CIB updated:

- -

Cael Aislinn updated:

- -

CaelAislinn updated:

- -

Cael_Aislinn updated:

- -

Chinsky updated:

- -

Erthilo updated:

- -

Gamerofthegame updated:

- -

GauHelldragon updated:

- -

Jediluke69 updated:

- -

Jupotter updated:

- -

Kilakk updated:

- -

Meyar updated:

- -

NerdyBoy1104 updated:

- -

RavingManiac updated:

- -

Segrain updated:

- -

SkyMarshal updated:

- -

Spamcat updated:

- -

VitrescentTortoise updated:

- -

Whitellama updated:

- -

Zuhayr updated:

- -

faux updated:

- -

proliberate updated:

- - -

30 July 2013

-

Erthilo updated:

- -

Kilakk updated:

- - -

28 July 2013

-

Segrain updated:

- - -

26 July 2013

-

Kilakk updated:

- - -

11 July 2013

-

Chinsky updated:

- - -

06 July 2013

-

Chinsky updated:

- - -

05 July 2013

-

Spamcat updated:

- - -

03 July 2013

-

Segrain updated:

- - -

28 June 2013

-

Segrain updated:

- - -

27 June 2013

-

Segrain updated:

- - -

26 June 2013

-

Segrain updated:

- -

Whitellama updated:

- - -

23 June 2013

-

Segrain updated:

- -

faux updated:

- - -

22 June 2013

-

Cael_Aislinn updated:

- - -

21 June 2013

-

Jupotter updated:

- - -

18 June 2013

-

Segrain updated:

- - -

13 June 2013

-

Kilakk updated:

- - -

12 June 2013

-

Zuhayr updated:

- - -

11 June 2013

-

Meyar updated:

- - -

09 June 2013

-

Segrain updated:

- - -

06 June 2013

-

Asanadas updated:

- -

Meyar updated:

- - -

05 June 2013

-

Chinsky updated:

- -

Segrain updated:

- - -

01 June 2013

-

Chinsky updated:

- - -

31 May 2013

-

Segrain updated:

- - -

30 May 2013

-

Segrain updated:

- -

Spamcat updated:

- -

proliberate updated:

- - -

28 May 2013

-

Erthilo updated:

- -

VitrescentTortoise updated:

- - -

26 May 2013

-

Chinsky updated:

- -

Meyar updated:

- -

VitrescentTortoise updated:

- - -

25 May 2013

-

Erthilo updated:

- - -

21 May 2013

-

SkyMarshal updated:

- - -

15 May 2013

-

Spamcat updated:

- - -

14 May 2013

-

Cael_Aislinn updated:

- - -

24 April 2013

-

Jediluke69 updated:

- -

NerdyBoy1104 updated:

- -

faux updated:

- - -

17 April 2013

-

SkyMarshal updated:

- - -

11 April 2013

-

SkyMarshal updated:

- - -

09 April 2013

-

SkyMarshal updated:

- - -

04 April 2013

-

SkyMarshal updated:

- -

Spamcat updated:

- - -

27 March 2013

-

Asanadas updated:

- - -

26 March 2013

-

Spamcat updated:

- - -

15 March 2013

-

Cael_Aislinn updated:

- - -

14 March 2013

-

Spamcat updated:

- - -

11 March 2013

-

CIB updated:

- -

Cael Aislinn updated:

- -

Chinsky updated:

- - -

09 March 2013

-

Cael Aislinn updated:

- - -

06 March 2013

-

Cael Aislinn updated:

- -

RavingManiac updated:

- - -

05 March 2013

-

CIB updated:

- -

Cael Aislinn updated:

- - -

27 February 2013

-

Gamerofthegame updated:

- - -

25 February 2013

-

Cael Aislinn updated:

- - -

23 February 2013

-

Cael Aislinn updated:

- - -

22 February 2013

-

Chinsky updated:

- - -

20 February 2013

-

Chinsky updated:

- - -

18 February 2013

-

Cael Aislinn updated:

- - -

14 February 2013

-

CIB updated:

- -

CaelAislinn updated:

- -

Gamerofthegame updated:

- - -

13 February 2013

-

Erthilo updated:

- - -

31 January 2013

-

CIB updated:

- - -

23 January 2013

-

Cael_Aislinn updated:

- - -

21 January 2013

-

Cael_Aislinn updated:

- - -

13 January 2013

-

Chinsky updated:

- -

GauHelldragon updated:

- - -

07 January 2013

-

Cael_Aislinn updated:

- -

Chinsky updated:

- + +

01 October 2018

+

PoZe updated:

+ + +

29 September 2018

+

PoZe updated:

+ + +

26 September 2018

+

Arrow768 updated:

+ + +

24 September 2018

+

Arrow768 updated:

+ + +

23 September 2018

+

Arrow768 updated:

+ + +

18 September 2018

+

PoZe updated:

+ + +

17 September 2018

+

Arrow768 updated:

+ + +

16 September 2018

+

Arrow768 updated:

+ +

CodePanter updated:

+ + +

14 September 2018

+

BurgerBB updated:

+ +

PoZe updated:

+ + +

11 September 2018

+

CodePanter updated:

+ +

MoondancerPony updated:

+ +

ParadoxSpace updated:

+ + +

10 September 2018

+

Alberyk updated:

+ +

Arrow768 updated:

+ + +

09 September 2018

+

BurgerBB updated:

+ +

CodePanter updated:

+ +

ParadoxSpace updated:

+ + +

05 September 2018

+

BurgerBB updated:

+ +

PoZe updated:

+ + +

03 September 2018

+

BurgerBB updated:

+ + +

02 September 2018

+

Alberyk updated:

+ +

Alberyk, Kyres1 updated:

+ +

Arrow768 updated:

+ +

BurgerBB updated:

+ +

Furrycactus updated:

+ +

LordFowl updated:

+ +

MoondancerPony updated:

+ +

NortonDK updated:

+ +

ParadoxSpace updated:

+ +

PoZe updated:

+ +

TheDocOct updated:

+ +

ben10083 updated:

+ + +

27 August 2018

+

BurgerBB updated:

+ + +

26 August 2018

+

Skull132 updated:

+ + +

25 August 2018

+

BurgerBB updated:

+ + +

14 August 2018

+

Arrow768 updated:

+ +

BurgerBB updated:

+ + +

11 August 2018

+

BurgerBB updated:

+ +

PoZe updated:

+ +

flimango updated:

+ + +

07 August 2018

+

BurgerBB updated:

+ +

flimango updated:

+ + +

06 August 2018

+

BurgerBB updated:

+ +

Karolis2011 updated:

+ + +

05 August 2018

+

Alberyk updated:

+ +

Arrow768 updated:

+ +

BurgerBB updated:

+ +

Fire and Glory updated:

+ +

Flamingo updated:

+ +

Karolis2011 updated:

+ +

LordFowl updated:

+ +

ParadoxSpace updated:

+ +

PoZe updated:

+ +

TheDocOct updated:

+ +

ben10083 updated:

+ + +

04 August 2018

+

Ron updated:

+ + +

29 July 2018

+

Alberyk updated:

+ +

BurgerBB updated:

+ +

Karolis2011 updated:

+ + +

24 July 2018

+

Arrow768 updated:

+ +

BurgerBB updated:

+ +

PoZe updated:

+ +

ben10083 updated:

+ + +

22 July 2018

+

Alberyk updated:

+ +

Arrow768 updated:

+ +

BurgerBB updated:

+ +

Kaedwuff updated:

+ +

Karolis2011 updated:

+ +

LordFowl updated:

+ +

LordFowl, BygoneHero, Kyres1 updated:

+ +

LordFowl, Loow, NursieKitty updated:

+ +

MattAtlas updated:

+ +

ParadoxSpace updated:

+ +

PoZe updated:

+ +

Skull132 updated:

+ +

ben10083 updated:

+ + +

17 July 2018

+

Alberyk updated:

+ +

BurgerBB updated:

+ +

PoZe updated:

+ + +

14 July 2018

+

Alberyk updated:

+ +

BurgerBB updated:

+ +

PoZe updated:

+ + +

27 June 2018

+

Arrow768 updated:

+ + +

26 June 2018

+

Lohikar updated:

+ +

PoZe updated:

+ + +

24 June 2018

+

PoZe updated:

+ + +

22 June 2018

+

Arrow768 updated:

+ + +

20 June 2018

+

BurgerBB updated:

+ + +

18 June 2018

+

Alberyk updated:

+ +

Arrow768 updated:

+ +

BurgerBB updated:

+ +

Code - PoZe, Sprites - DronzTheWolf updated:

+ +

Kaedwuff updated:

+ +

LordFowl updated:

+ +

LordRaven001 updated:

+ +

MoondancerPony updated:

+ +

PoZe updated:

+ +

Scheveningen updated:

+ +

ben10083 updated:

+ + +

16 June 2018

+

Arrow768 updated:

+ + +

10 June 2018

+

Arrow768 updated:

+ + +

03 June 2018

+

BurgerBB updated:

+ + +

29 May 2018

+

Kaedwuff updated:

+ + +

28 May 2018

+

Kaedwuff updated:

+ + +

25 May 2018

+

Arrow768 updated:

+ +

LordFowl updated:

+ +

PoZe updated:

+ + +

22 May 2018

+

Arrow768 updated:

+ +

Lohikar updated:

+ + +

20 May 2018

+

BurgerBB updated:

+ + +

17 May 2018

+

Kaedwuff updated:

+ +

PoZe updated:

+ + +

14 May 2018

+

BurgerBB updated:

+ + +

13 May 2018

+

Alberyk updated:

+ +

Arrow768 updated:

+ +

Banditoz updated:

+ +

BurgerBB updated:

+ +

ParadoxSpace updated:

+ +

PoZe updated:

+ +

Skull132 updated:

+ + +

10 May 2018

+

Kaedwuff updated:

+ + +

07 May 2018

+

BurgerBB updated:

+ +

PoZe updated:

+ + +

25 April 2018

+

Alberyk updated:

+ +

Arrow768 updated:

+ + +

19 April 2018

+

PoZe updated:

+ + +

15 April 2018

+

BurgerBB updated:

+ +

Lohikar updated:

+ + +

12 April 2018

+

Printer16 updated:

+ + +

08 April 2018

+

Alberyk updated:

+ +

Arrow768 updated:

+ +

BurgerBB updated:

+ +

Kaedwuff updated:

+ +

LordFowl updated:

+ +

ParadoxSpace updated:

+ +

PoZe updated:

+ +

Ron updated:

+ +

Skull132 updated:

+ +

TheGreatNacho updated:

+ +

soryy708 updated:

+ + +

06 April 2018

+

Printer16 updated:

+ + +

31 March 2018

+

TheGreatNacho updated:

+ + +

21 March 2018

+

BurgerBB updated:

+ + +

18 March 2018

+

Alberyk updated:

+ +

Skull132 updated:

+ + +

13 March 2018

+

BurgerBB updated:

+ + +

10 March 2018

+

Alberyk updated:

+ +

Arrow768 updated:

+ +

BurgerBB updated:

+ +

Buterrobber202 updated:

+ +

Ezuo updated:

+ +

Juani2400 updated:

+ +

Kaedwuff updated:

+ +

Lohikar updated:

+ +

LordFowl updated:

+ +

PoZe, AndurilFlame updated:

+ +

Skull132 updated:

+ +

kevinz000 updated:

+ + +

24 February 2018

+

BurgerBB updated:

+ +

sdtwbaj updated:

+ + +

11 February 2018

+

Lohikar updated:

+ + +

04 February 2018

+

Alberyk updated:

+ +

LordFowl updated:

+ + +

31 January 2018

+

LordFowl updated:

+ + +

29 January 2018

+

Alberyk updated:

+ + +

28 January 2018

+

BurgerBB updated:

+ + +

27 January 2018

+

AgentWhatever updated:

+ +

Alberyk updated:

+ +

Arrow768 updated:

+ +

BRAINOS updated:

+ +

BurgerBB updated:

+ +

Chaoko99 updated:

+ +

Ezuo updated:

+ +

Lohikar updated:

+ +

LordFowl updated:

+ +

MattAtlas updated:

+ +

Pacmandevil updated:

+ +

Printer16 updated:

+ +

Scheveningen updated:

+ +

Skull132 updated:

+ +

Synnono updated:

+ +

WrongEnd updated:

+ + +

14 January 2018

+

Lohikar updated:

+ +

LordFowl updated:

+ + +

30 December 2017

+

PoZe updated:

+ + +

22 December 2017

+

Alberyk updated:

+ +

LordFowl updated:

+ + +

12 December 2017

+

Lohikar updated:

+ +

PoZe updated:

+ +

Skull132 updated:

+ + +

08 December 2017

+

Lohikar updated:

+ +

Santa updated:

+ + +

30 November 2017

+

Alberyk updated:

+ +

Lohikar updated:

+ +

MoondancerPony updated:

+ +

PoZe updated:

+ + +

20 November 2017

+

Alberyk updated:

+ +

Lohikar updated:

+ + +

11 November 2017

+

TheGreatJorge updated:

+ + +

05 November 2017

+

Chaoko99 updated:

+ +

Karolis2011 updated:

+ +

Printer16 updated:

+ + +

30 October 2017

+

Alberyk updated:

+ + +

29 October 2017

+

Skull132 updated:

+ + +

28 October 2017

+

Alberyk updated:

+ +

Chaoko99 updated:

+ +

TheGreatJorge updated:

+ + +

24 October 2017

+

Lohikar updated:

+ + +

22 October 2017

+

Skull132 updated:

+ + +

20 October 2017

+

Lohikar updated:

+ +

MoondancerPony updated:

+ + +

15 October 2017

+

AgentWhatever updated:

+ +

Alberyk updated:

+ +

Arrow768 updated:

+ +

BRAINOS updated:

+ +

Belsima updated:

+ +

Chaoko99 updated:

+ +

Ezuo updated:

+ +

HetNeSS updated:

+ +

Juani2400 updated:

+ +

Karolis2011 updated:

+ +

Lohikar updated:

+ +

MoondancerPony updated:

+ +

Pacmandevil updated:

+ +

Printer16 updated:

+ +

Scheveningen updated:

+ +

SoundScopes updated:

+ +

wraithcraft updated:

+ + +

13 October 2017

+

Alberyk updated:

+ +

Belsima updated:

+ +

MoondancerPony updated:

+ + +

17 September 2017

+

Skull132 updated:

+ + +

14 September 2017

+

Lohikar updated:

+ +

MoondancerPony updated:

+ + +

09 September 2017

+

Ezuo updated:

+ + +

06 September 2017

+

Skull132 updated:

+ + +

05 September 2017

+

Lohikar updated:

+ + +

27 August 2017

+

Printer16 updated:

+ + +

23 August 2017

+

Lohikar updated:

+ + +

15 August 2017

+

Lohikar updated:

+ + +

13 August 2017

+

Lohikar updated:

+ + +

07 August 2017

+

Lohikar updated:

+ + +

05 August 2017

+

Alberyk updated:

+ + +

04 August 2017

+

Lohikar updated:

+ + +

03 August 2017

+

Skull132 updated:

+ + +

02 August 2017

+

Lohikar updated:

+ + +

31 July 2017

+

Lohikar updated:

+ + +

27 July 2017

+

Lohikar updated:

+ + +

25 July 2017

+

MoondancerPony updated:

+ + +

24 July 2017

+

Lohikar updated:

+ + +

23 July 2017

+

Lohikar updated:

+ +

Skull132 updated:

+ + +

21 July 2017

+

Alberyk updated:

+ +

Skull132 updated:

+ + +

20 July 2017

+

Lohikar updated:

+ +

Skull132 updated:

+ + +

18 July 2017

+

AgentWhatever updated:

+ + +

16 July 2017

+

AgentWhatever updated:

+ +

Alberyk updated:

+ +

Arrow768 updated:

+ +

Fire and Glory updated:

+ +

HetNeSS updated:

+ +

Lohikar updated:

+ +

LordFowl updated:

+ +

MoondancerPony updated:

+ +

Nanako updated:

+ +

Printer16 updated:

+ +

Skull132 updated:

+ +

Synnono updated:

+ +

Wraithcraft updated:

+ +

inselc updated:

+ + +

15 June 2017

+

inselc updated:

+ + +

13 June 2017

+

Nanako updated:

+ + +

16 May 2017

+

Printer16 updated:

+ + +

14 May 2017

+

Alberyk updated:

+ + +

01 May 2017

+

Fire and Glory updated:

+ +

Lohikar updated:

+ + +

29 April 2017

+

Lohikar updated:

+ +

LordFowl updated:

+ + +

19 April 2017

+

Ccomp5950 updated:

+ + +

14 April 2017

+

Lohikar updated:

+ +

MoondancerPony updated:

+ +

Nanako updated:

+ + +

12 April 2017

+

MoondancerPony updated:

+ + +

10 April 2017

+

Lohikar updated:

+ +

MoondancerPony updated:

+ + +

08 April 2017

+

MoondancerPony updated:

+ +

Nanako updated:

+ +

Printer16 updated:

+ +

inselc updated:

+ + +

03 April 2017

+

Lohikar updated:

+ +

Nanako updated:

+ + +

02 April 2017

+

Alberyk updated:

+ +

Lohikar updated:

+ + +

30 March 2017

+

Lohikar updated:

+ + +

29 March 2017

+

Skull132 updated:

+ + +

26 March 2017

+

Lohikar updated:

+ + +

25 March 2017

+

inselc updated:

+ + +

22 March 2017

+

Lohikar updated:

+ +

Nanako updated:

+ +

Skull132 updated:

+ + +

19 March 2017

+

AgentWhatever updated:

+ +

Alberyk updated:

+ +

Arrow768 updated:

+ +

Fire and Glory updated:

+ +

Lohikar updated:

+ +

LordFowl updated:

+ +

Nanako updated:

+ +

Printer16 updated:

+ +

Skull132 updated:

+ +

VikingPingvin updated:

+ + +

14 March 2017

+

LordFowl updated:

+ + +

05 March 2017

+

Skull132 updated:

+ + +

17 February 2017

+

LordFowl updated:

+ + +

10 February 2017

+

Alberyk updated:

+ + +

07 February 2017

+

Lohikar updated:

+ + +

03 February 2017

+

Alberyk updated:

+ + +

30 January 2017

+

Lohikar updated:

+ + +

29 January 2017

+

Alberky updated:

+ + +

25 January 2017

+

Skull132 updated:

+ + +

23 January 2017

+

Alberyk updated:

+ + +

21 January 2017

+

Alberyk updated:

+ +

Skull132 updated:

+ + +

20 January 2017

+

Nanako updated:

+ + +

19 January 2017

+

Alberyk updated:

+ + +

15 January 2017

+

Lohikar updated:

+ +

LordFowl updated:

+ +

Nanako updated:

+ + +

12 January 2017

+

Lohikar updated:

+ +

Nanako updated:

+ +

Skull132 updated:

+ + +

11 January 2017

+

Alberyk updated:

+ +

Nanako updated:

+ + +

08 January 2017

+

Lohikar updated:

+ + +

07 January 2017

+

Alberyk updated:

+ +

Arrow768 updated:

+ +

Bedshaped updated:

+ +

Lohikar updated:

+ +

LordFowl updated:

+ +

Nanako updated:

+ +

Printer16 updated:

+ +

Serveris updated:

+ +

Skull132 updated:

+ + +

29 December 2016

+

Lohikar updated:

+ + +

24 December 2016

+

Atlantis updated:

+ +

Chinsky updated:

+ +

Datraen updated:

+ +

GinjaNinja32 updated:

+ +

HarpyEagle updated:

+ +

Hubblenaut updated:

+ +

Karolis2011 updated:

+ +

Kelenius updated:

+ +

Loganbacca updated:

+ +

Matthew951 updated:

+ +

Neerti updated:

+ +

Orelbon updated:

+ +

PsiOmegaDelta updated:

+ +

Raptor1628 updated:

+ +

RavingManiac updated:

+ +

Sligneris updated:

+ +

Soadreqm updated:

+ +

Techhead updated:

+ +

TheWelp updated:

+ +

Vivalas updated:

+ +

Yoshax updated:

+ +

Zuhayr updated:

+ +

neersighted updated:

+ + +

06 December 2016

+

Santa updated:

+ + +

21 November 2016

+

Alberyk updated:

+ + +

18 November 2016

+

Bedshaped updated:

+ +

Nanako updated:

+ + +

11 November 2016

+

Bedshaped updated:

+ + +

09 November 2016

+

Nanako updated:

+ +

Skull132 updated:

+ + +

07 November 2016

+

Skull132 updated:

+ + +

06 November 2016

+

Alberyk updated:

+ +

Bedshaped updated:

+ +

Fire and Glory updated:

+ +

LordFowl updated:

+ +

Nanako updated:

+ +

OneOneThreeEight updated:

+ +

inselc updated:

+ + +

30 October 2016

+

inselc updated:

+ + +

29 October 2016

+

inselc updated:

+ + +

13 October 2016

+

Alberyk updated:

+ + +

07 October 2016

+

Alberyk updated:

+ + +

02 October 2016

+

Skull132 updated:

+ + +

01 October 2016

+

Alberyk updated:

+ +

Nanako updated:

+ +

Skull132 updated:

+ + +

28 September 2016

+

Alberyk updated:

+ +

Bedshaped updated:

+ + +

25 September 2016

+

Nanako updated:

+ +

Skull132 updated:

+ + +

21 September 2016

+

Bedshaped updated:

+ + +

19 September 2016

+

Alberyk updated:

+ +

Arrow768 updated:

+ +

Bedshaped updated:

+ +

Fire and Glory updated:

+ +

Nadrew updated:

+ +

Nanako updated:

+ +

Skull132 updated:

+ +

SoundScopes updated:

+ + +

31 August 2016

+

Bedshaped updated:

+ + +

25 August 2016

+

Bedshaped updated:

+ +

Skull132 updated:

+ + +

15 August 2016

+

Alberyk updated:

+ +

Bedshaped updated:

+ +

Nanako updated:

+ +

Skull132 updated:

+ + +

13 August 2016

+

Nanako updated:

+ + +

12 August 2016

+

Nanako updated:

+ + +

10 August 2016

+

Alberyk updated:

+ +

Skull132 updated:

+ + +

08 August 2016

+

Alberyk updated:

+ +

Bedshaped updated:

+ +

LordFowl updated:

+ +

Nanako updated:

+ +

Skull132 updated:

+ +

alberyk updated:

+ + +

03 August 2016

+

LordFowl updated:

+ + +

24 July 2016

+

Alberyk updated:

+ +

Bedshaped updated:

+ +

LordFowl updated:

+ + +

20 July 2016

+

Skull132 updated:

+ + +

18 July 2016

+

Alberyk updated:

+ +

Arrow768 updated:

+ +

Bedshaped updated:

+ +

Fire and Glory updated:

+ +

Lord Lag updated:

+ +

LordFowl updated:

+ +

Nanako updated:

+ +

Skull132 updated:

+ + +

12 July 2016

+

LordFowl updated:

+ + +

10 July 2016

+

Alberyk updated:

+ +

LordFowl updated:

+ + +

05 July 2016

+

Alberyk updated:

+ +

Nanako updated:

+ + +

29 June 2016

+

Skull132 updated:

+ + +

27 June 2016

+

Nanako updated:

+ + +

25 June 2016

+

LordFowl updated:

+ + +

24 June 2016

+

LordFowl updated:

+ +

Skull132 updated:

+ + +

23 June 2016

+

Alberyk updated:

+ +

Bedshaped updated:

+ +

Nanako updated:

+ +

Skull132 updated:

+ + +

22 June 2016

+

Alberyk updated:

+ +

Nanako updated:

+ +

Skull132 updated:

+ + +

20 June 2016

+

Arrow768 updated:

+ +

LordFowl updated:

+ + +

04 June 2016

+

Arrow768 updated:

+ +

Skull132 updated:

+ + +

01 June 2016

+

LordFowl updated:

+ +

Skull132 updated:

+ + +

31 May 2016

+

Nanako updated:

+ + +

30 May 2016

+

Akrilla updated:

+ +

Arrow768 updated:

+ +

Brightdawn updated:

+ +

Lord Lag updated:

+ +

LordFowl updated:

+ +

Skull132 updated:

+ + +

25 March 2016

+

Lord Lag updated:

+ +

Skull132 updated:

+ + +

03 March 2016

+

Lord Lag updated:

+ + +

21 February 2016

+

Skull132 updated:

+ + +

16 February 2016

+

Skull132 updated:

+ + +

15 February 2016

+

Lord Lag updated:

+ + +

12 February 2016

+

Ryan784 updated:

+ + +

01 February 2016

+

Lady of Ravens updated:

+ +

Lord Lag updated:

+ +

Mahzel updated:

+ +

Ryan784 updated:

+ +

Skull132 updated:

+ + +

06 December 2015

+

Hubblenaut updated:

+ + +

22 November 2015

+

neersighted updated:

+ + +

27 October 2015

+

HarpyEagle updated:

+ + +

14 October 2015

+

Hubblenaut updated:

+ +

TheWelp updated:

+ + +

10 October 2015

+

HarpyEagle updated:

+ + +

11 September 2015

+

HarpyEagle updated:

+ + +

05 September 2015

+

Zuhayr updated:

+ + +

24 August 2015

+

HarpyEagle updated:

+ +

Zuhayr updated:

+ + +

17 August 2015

+

PsiOmegaDelta updated:

+ + +

11 August 2015

+

PsiOmegaDelta updated:

+ + +

31 July 2015

+

HarpyEagle updated:

+ + +

29 July 2015

+

Karolis2011 updated:

+ + +

27 July 2015

+

Kelenius updated:

+ + +

14 July 2015

+

HarpyEagle updated:

+ +

PsiOmegaDelta updated:

+ + +

11 July 2015

+

HarpyEagle updated:

+ +

Loganbacca updated:

+ + +

10 July 2015

+

Zuhayr updated:

+ + +

06 July 2015

+

GinjaNinja32 updated:

+ + +

04 July 2015

+

PsiOmegaDelta updated:

+ + +

30 June 2015

+

PsiOmegaDelta updated:

+ + +

24 June 2015

+

HarpyEagle updated:

+ + +

19 June 2015

+

HarpyEagle updated:

+ + +

05 June 2015

+

PsiOmegaDelta updated:

+ + +

04 June 2015

+

PsiOmegaDelta updated:

+ + +

02 June 2015

+

Techhead updated:

+ + +

30 May 2015

+

Atlantis updated:

+ +

HarpyEagle updated:

+ +

PsiOmegaDelta updated:

+ + +

27 May 2015

+

PsiOmegaDelta updated:

+ + +

22 May 2015

+

Ccomp5950 updated:

+ +

Chinsky updated:

+ +

HarpyEagle updated:

+ +

Yoshax updated:

+ +

Zuhayr updated:

+ + +

18 May 2015

+

Hubblenaut updated:

+ +

Kelenius updated:

+ +

Loganbacca updated:

+ +

PsiOmegaDelta updated:

+ + +

17 May 2015

+

PsiOmegaDelta updated:

+ + +

16 May 2015

+

GinjaNinja32 updated:

+ +

HarpyEagle updated:

+ + +

14 May 2015

+

PsiOmegaDelta updated:

+ +

Techhead updated:

+ + +

12 May 2015

+

Dennok updated:

+ +

HarpyEagle updated:

+ +

MrSnapwalk updated:

+ +

PsiOmegaDelta updated:

+ + +

11 May 2015

+

Mloc updated:

+ +

PsiOmegaDelta updated:

+ +

Techhead updated:

+ + +

10 May 2015

+

GinjaNinja32 updated:

+ +

Yoshax updated:

+ + +

09 May 2015

+

Yoshax updated:

+ + +

07 May 2015

+

HarpyEagle updated:

+ +

PsiOmegaDelta updated:

+ +

RavingManiac updated:

+ + +

06 May 2015

+

PsiOmegaDelta updated:

+ + +

05 May 2015

+

PsiOmegaDelta updated:

+ +

RavingManiac updated:

+ + +

02 May 2015

+

HarpyEagle updated:

+ +

PsiOmegaDelta updated:

+ +

Yoshax updated:

+ + +

30 April 2015

+

Yoshax updated:

+ + +

29 April 2015

+

Daranz updated:

+ +

HarpyEagle updated:

+ +

PsiOmegaDelta updated:

+ + +

28 April 2015

+

Jarcolr updated:

+ +

Kelenius updated:

+ +

PsiOmegaDelta updated:

+ +

RavingManiac updated:

+ +

Yoshax updated:

+ + +

24 April 2015

+

Dennok updated:

+ + +

23 April 2015

+

Dennok updated:

+ +

PsiOmegaDelta updated:

+ +

Yoshax updated:

+ + +

18 April 2015

+

PsiOmegaDelta updated:

+ + +

07 April 2015

+

RavingManiac updated:

+ + +

24 February 2015

+

Zuhayr updated:

+ + +

18 February 2015

+

PsiOmegaDelta updated:

+ + +

16 February 2015

+

RavingManiac updated:

+ + +

12 February 2015

+

Daranz updated:

+ + +

04 February 2015

+

RavingManiac updated:

+ +

TwistedAkai updated:

+ + +

09 January 2015

+

Zuhayr updated:

+ + +

22 November 2014

+

Zuhayr updated:

+ + +

08 November 2014

+

PsiOmegaDelta updated:

+ + +

04 November 2014

+

TwistedAkai updated:

+ + +

01 November 2014

+

PsiOmegaDelta updated:

+ + +

01 October 2014

+

RavingManiac updated:

+ +

Zuhayr updated:

+ + +

28 September 2014

+

Gamerofthegame updated:

+ +

Zuhayr updated:

+ + +

20 September 2014

+

HarpyEagle updated:

+ + +

05 September 2014

+

RavingManiac updated:

+ + +

31 August 2014

+

Whitellama updated:

+ + +

27 August 2014

+

Whitellama updated:

+ + +

05 August 2014

+

HarpyEagle updated:

+ + +

02 August 2014

+

Whitellama updated:

+ + +

31 July 2014

+

HarpyEagle updated:

+ + +

26 July 2014

+

Whitellama updated:

+ + +

20 July 2014

+

PsiOmegaDelta updated:

+ + +

06 July 2014

+

HarpyEagle updated:

+ + +

01 July 2014

+

Various updated:

+ + +

20 June 2014

+

Cael_Aislinn updated:

+ + +

19 June 2014

+

Chinsky updated:

+ + +

15 June 2014

+

HarpyEagle updated:

+ + +

13 June 2014

+

HarpyEagle updated:

+ + +

03 June 2014

+

Hubblenaut updated:

+ + +

31 May 2014

+

Jarcolr updated:

+ + +

28 May 2014

+

Chinsky updated:

+ + +

23 May 2014

+

Hubble updated:

+ + +

16 May 2014

+

HarpyEagle updated:

+ + +

06 May 2014

+

Hubble updated:

+ + +

03 May 2014

+

Cael_Aislinn updated:

+ + +

29 April 2014

+

HarpyEagle updated:

+ + +

25 April 2014

+

Various updated:

+ + +

11 April 2014

+

Jarcolr updated:

+ + +

06 April 2014

+

RavingManiac updated:

+ + +

30 March 2014

+

RavingManiac updated:

+ + +

10 March 2014

+

Chinsky updated:

+ + +

05 March 2014

+

RavingManiac updated:

+ + +

01 March 2014

+

Various updated:

+ + +

19 February 2014

+

Aryn updated:

+ + +

01 February 2014

+

Various updated:

+ + +

01 January 2014

+

Various updated:

+ + +

18 December 2013

+

RavingManiac updated:

+ + +

01 December 2013

+

Various Developers banged their keyboards together: updated:

+ + +

24 November 2013

+

Yinadele updated:

+ + +

23 November 2013

+

Ccomp5950 updated:

+ + +

01 November 2013

+

Various updated:

+ + +

29 October 2013

+

Cael_Aislinn updated:

+ + +

06 October 2013

+

Chinsky updated:

+ + +

24 September 2013

+

Snapshot updated:

+ + +

18 September 2013

+

Kilakk updated:

+ + +

08 August 2013

+

Erthilo updated:

+ + +

04 August 2013

+

Chinsky updated:

+ + +

01 August 2013

+

Asanadas updated:

+ +

CIB updated:

+ +

Cael Aislinn updated:

+ +

CaelAislinn updated:

+ +

Cael_Aislinn updated:

+ +

Chinsky updated:

+ +

Erthilo updated:

+ +

Gamerofthegame updated:

+ +

GauHelldragon updated:

+ +

Jediluke69 updated:

+ +

Jupotter updated:

+ +

Kilakk updated:

+ +

Meyar updated:

+ +

NerdyBoy1104 updated:

+ +

RavingManiac updated:

+ +

Segrain updated:

+ +

SkyMarshal updated:

+ +

Spamcat updated:

+ +

VitrescentTortoise updated:

+ +

Whitellama updated:

+ +

Zuhayr updated:

+ +

faux updated:

+ +

proliberate updated:

+ + +

30 July 2013

+

Erthilo updated:

+ +

Kilakk updated:

+ + +

28 July 2013

+

Segrain updated:

+ + +

26 July 2013

+

Kilakk updated:

+ + +

11 July 2013

+

Chinsky updated:

+ + +

06 July 2013

+

Chinsky updated:

+ + +

05 July 2013

+

Spamcat updated:

+ + +

03 July 2013

+

Segrain updated:

+ + +

28 June 2013

+

Segrain updated:

+ + +

27 June 2013

+

Segrain updated:

+ + +

26 June 2013

+

Segrain updated:

+ +

Whitellama updated:

+ + +

23 June 2013

+

Segrain updated:

+ +

faux updated:

+ + +

22 June 2013

+

Cael_Aislinn updated:

+ + +

21 June 2013

+

Jupotter updated:

+ + +

18 June 2013

+

Segrain updated:

+ + +

13 June 2013

+

Kilakk updated:

+ + +

12 June 2013

+

Zuhayr updated:

+ + +

11 June 2013

+

Meyar updated:

+ + +

09 June 2013

+

Segrain updated:

+ + +

06 June 2013

+

Asanadas updated:

+ +

Meyar updated:

+ + +

05 June 2013

+

Chinsky updated:

+ +

Segrain updated:

+ + +

01 June 2013

+

Chinsky updated:

+ + +

31 May 2013

+

Segrain updated:

+ + +

30 May 2013

+

Segrain updated:

+ +

Spamcat updated:

+ +

proliberate updated:

+ + +

28 May 2013

+

Erthilo updated:

+ +

VitrescentTortoise updated:

+ + +

26 May 2013

+

Chinsky updated:

+ +

Meyar updated:

+ +

VitrescentTortoise updated:

+ + +

25 May 2013

+

Erthilo updated:

+ + +

21 May 2013

+

SkyMarshal updated:

+ + +

15 May 2013

+

Spamcat updated:

+ + +

14 May 2013

+

Cael_Aislinn updated:

+ + +

24 April 2013

+

Jediluke69 updated:

+ +

NerdyBoy1104 updated:

+ +

faux updated:

+ + +

17 April 2013

+

SkyMarshal updated:

+ + +

11 April 2013

+

SkyMarshal updated:

+ + +

09 April 2013

+

SkyMarshal updated:

+ + +

04 April 2013

+

SkyMarshal updated:

+ +

Spamcat updated:

+ + +

27 March 2013

+

Asanadas updated:

+ + +

26 March 2013

+

Spamcat updated:

+ + +

15 March 2013

+

Cael_Aislinn updated:

+ + +

14 March 2013

+

Spamcat updated:

+ + +

11 March 2013

+

CIB updated:

+ +

Cael Aislinn updated:

+ +

Chinsky updated:

+ + +

09 March 2013

+

Cael Aislinn updated:

+ + +

06 March 2013

+

Cael Aislinn updated:

+ +

RavingManiac updated:

+ + +

05 March 2013

+

CIB updated:

+ +

Cael Aislinn updated:

+ + +

27 February 2013

+

Gamerofthegame updated:

+ + +

25 February 2013

+

Cael Aislinn updated:

+ + +

23 February 2013

+

Cael Aislinn updated:

+ + +

22 February 2013

+

Chinsky updated:

+ + +

20 February 2013

+

Chinsky updated:

+ + +

18 February 2013

+

Cael Aislinn updated:

+ + +

14 February 2013

+

CIB updated:

+ +

CaelAislinn updated:

+ +

Gamerofthegame updated:

+ + +

13 February 2013

+

Erthilo updated:

+ + +

31 January 2013

+

CIB updated:

+ + +

23 January 2013

+

Cael_Aislinn updated:

+ + +

21 January 2013

+

Cael_Aislinn updated:

+ + +

13 January 2013

+

Chinsky updated:

+ +

GauHelldragon updated:

+ + +

07 January 2013

+

Cael_Aislinn updated:

+ +

Chinsky updated:

+
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index c2c82619918..d6e4cff1457 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -6064,3 +6064,76 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. cookout of the month, NT has graciously allowed gardeners to have service cloaks. - rscadd: Crafty Unathi and Tajaran crewmembers have learned a new way to slightly adjust their tails as to not stick out of cloaks and ponchos. +2018-09-10: + Alberyk: + - bugfix: Water coolers are working as intended now. + - bugfix: Emag interactions with the ATM should work as intended now. + - bugfix: Welding fuel tanks should now explode when in contact with fire or rigged, + as long they were open with a wrench. + Arrow768: + - balance: Nerfs ZoRa Soda. +2018-09-11: + CodePanter: + - spellcheck: Corrected a typo in the string used when a player combines two battle + monsters decks. + MoondancerPony: + - bugfix: Attack logs now show general regions if the limb itself is obscured by + clothing. + - bugfix: Wound flavortext is now hidden if the limb is obscured by clothing. + - bugfix: AOOC is now re-added to antagonists who de-admin. + ParadoxSpace: + - bugfix: After much internal debate among their nymphs, Diona gestalts have now + decided it's probably a good idea to regenerate their limbs again. + - tweak: Increases amount of energy and nutrition Diona need to do such. Eat up. +2018-09-14: + BurgerBB: + - bugfix: Fixed offline Battlemonster vending machine sprite having a white background. + Fixes card searching typo. + - tweak: Adjusted battlemonster star calculation. Slightly lowered the cost of battlemonster + cards. Deck searching speed is now based on the number of cards in the deck. + PoZe: + - bugfix: Blast doors and shutters no longer glitch when APC has no power(Or during + grid check event). +2018-09-16: + Arrow768: + - bugfix: Nanotrasen Scientists have managed to restore the cameras in the ERT helmets. + CodePanter: + - bugfix: Reconfigured five station intercoms that were incorrectly using the security + interrogation channel. +2018-09-17: + Arrow768: + - bugfix: NanoTrasen has updated the operating systems to prevent them from being + stuck in maint mode after prolonged storage. +2018-09-18: + PoZe: + - bugfix: Beepsky/ED209 no longer move around when turned off + - bugfix: Red track pants now spawn the right item(instead of blue) + - bugfix: Cybrogs can now interact with curtains to open and close them. + - bugfix: Newscaster no longer keep photos after you remove it. + - maptweak: Bar and kitchen have emergency O2 wall lockers. + - maptweak: Bar theater and Kitchen Pantry now have security cameras + - bugfix: ED209 no longer shoots far away, but gets closer into shooting range distance + with its target +2018-09-23: + Arrow768: + - bugfix: Adds a check to the slime AI to loose interest in the current victim if + they are dead. +2018-09-24: + Arrow768: + - bugfix: After complaints from various departments NanoTrasen has ensured that + certain vending machines are always restocked by the cleanup crew. + - bugfix: The derelict shuttle will no longer show up on the power monitoring console. +2018-09-26: + Arrow768: + - tweak: The cult of narsie has updated their bylaws and allowed ipcs to join as + full members again. +2018-09-29: + PoZe: + - bugfix: Personal closets can no longer be locked/unlocked from the inside. +2018-10-01: + PoZe: + - bugfix: HOP office disposal system is properly connected, so it can receive delivery + and send trash properly. + - bugfix: Bishop IPC frame can now wear voidsuits. + - bugfix: Bishop and Zeng-Hu frames can now wear wizards and mercs voidsuits, making + all IPC frame able to wear these antag voidsuits. diff --git a/icons/mob/species/vaurca/back.dmi b/icons/mob/species/vaurca/back.dmi new file mode 100644 index 00000000000..a329a5d37c5 Binary files /dev/null and b/icons/mob/species/vaurca/back.dmi differ diff --git a/icons/obj/custom_items/ryn_clothing.dmi b/icons/obj/custom_items/ryn_clothing.dmi new file mode 100644 index 00000000000..300d1d9c718 Binary files /dev/null and b/icons/obj/custom_items/ryn_clothing.dmi differ diff --git a/icons/obj/custom_items/talon_coat.dmi b/icons/obj/custom_items/talon_coat.dmi index e0bd19fb360..1caad87eb3e 100644 Binary files a/icons/obj/custom_items/talon_coat.dmi and b/icons/obj/custom_items/talon_coat.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 69b0a2148bd..42d845419d5 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 5924e0d9b1f..6c4cf25f2a5 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -9907,7 +9907,7 @@ "wP" = ( /obj/machinery/computer/security/telescreen{ name = "Spec. Ops. Monitor"; - network = list("ERT") + network = list("ZeEmergencyResponseTeam") }, /obj/structure/table/wood{ dir = 5 @@ -12812,7 +12812,7 @@ /obj/machinery/computer/security/telescreen{ desc = ""; name = "Spec. Ops. Monitor"; - network = list("ERT"); + network = list("ZeEmergencyResponseTeam"); pixel_y = 30 }, /obj/machinery/computer/shuttle_control/specops, diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 6be8dd6e70b..b17a4881ffc 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -17829,7 +17829,7 @@ /area/crew_quarters/captain) "aGo" = ( /obj/item/device/radio/intercom{ - frequency = 1449; + frequency = 1459; pixel_x = 0; pixel_y = -27 }, @@ -19854,9 +19854,6 @@ /turf/simulated/floor/tiled, /area/bridge) "aJC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/floor_decal/corner/paleblue{ icon_state = "corner_white"; dir = 10 @@ -23971,7 +23968,7 @@ icon_state = "4-8" }, /obj/item/device/radio/intercom{ - frequency = 1449; + frequency = 1459; pixel_x = 0; pixel_y = -27 }, @@ -23985,7 +23982,7 @@ icon_state = "4-8" }, /obj/item/device/radio/intercom{ - frequency = 1449; + frequency = 1459; pixel_x = 0; pixel_y = -27 }, @@ -47752,7 +47749,8 @@ /obj/machinery/camera/network/civilian_east{ c_tag = "Kitchen - Canteen"; c_tag_order = 999; - dir = 2 + dir = 2; + network = list("Service") }, /obj/machinery/light_switch{ pixel_x = 8; @@ -48998,7 +48996,8 @@ /obj/machinery/camera/network/civilian_east{ c_tag = "Kitchen - Southwest"; c_tag_order = 999; - dir = 1 + dir = 1; + network = list("Service") }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -50033,7 +50032,8 @@ /obj/machinery/camera/network/civilian_east{ c_tag = "Bar - East"; c_tag_order = 999; - dir = 8 + dir = 8; + network = list("Service") }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) @@ -58854,7 +58854,8 @@ /obj/machinery/camera/network/civilian_east{ c_tag = "Kitchen - Northeast"; c_tag_order = 999; - dir = 2 + dir = 2; + network = list("Service") }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -59225,6 +59226,12 @@ }, /obj/item/weapon/storage/box/kitchen, /obj/item/weapon/storage/box/gloves, +/obj/machinery/camera/network/civilian_east{ + c_tag = "Kitchen - Pantry"; + c_tag_order = 999; + dir = 8; + network = list("Service") + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "gsR" = ( @@ -59632,7 +59639,8 @@ /obj/machinery/camera/network/civilian_east{ c_tag = "Bar - North"; c_tag_order = 999; - dir = 2 + dir = 2; + network = list("Service") }, /obj/machinery/atm{ pixel_x = 0; @@ -59926,7 +59934,8 @@ /obj/machinery/camera/network/civilian_east{ c_tag = "Bar - West"; c_tag_order = 999; - dir = 4 + dir = 4; + network = list("Service") }, /obj/machinery/firealarm/west, /turf/simulated/floor/wood, @@ -65337,6 +65346,30 @@ }, /turf/simulated/floor/tiled, /area/outpost/mining_main/eva) +"ykl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/closet/walllocker/emerglocker/north, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) +"ykm" = ( +/obj/machinery/camera/network/civilian_east{ + c_tag = "Bar - Theater Supplies"; + c_tag_order = 999; + dir = 4; + network = list("Service") + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/bar) +"ykn" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + icon_state = "spline_fancy"; + dir = 8 + }, +/obj/structure/closet/walllocker/emerglocker/west, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) (1,1,1) = {" aaa @@ -95593,7 +95626,7 @@ bVa bVa bZw bVa -gtH +ykn guT bUz hoM @@ -98670,7 +98703,7 @@ bSv bUz bWC bWC -bWC +ykm bWC bWC bWC @@ -98913,7 +98946,7 @@ bGA bGA bOC bPI -bQQ +ykl grT jXF gss diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index 8c645d21ebf..56ec2efed38 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -13537,7 +13537,9 @@ /obj/structure/table/standard{ name = "plastic table frame" }, -/obj/machinery/photocopier/faxmachine, +/obj/machinery/photocopier/faxmachine{ + department = "Command-Surface" + }, /turf/simulated/floor/tiled, /area/bridge/levela) "yO" = ( diff --git a/maps/aurora/aurora-7_roof.dmm b/maps/aurora/aurora-7_roof.dmm index d1e735283cc..476685f6f18 100644 --- a/maps/aurora/aurora-7_roof.dmm +++ b/maps/aurora/aurora-7_roof.dmm @@ -26218,7 +26218,7 @@ ag ag ag ag -dC +aw al ab ab diff --git a/maps/dungeon_spawns/shuttle_unique.dmm b/maps/dungeon_spawns/shuttle_unique.dmm index 2b4b759fbe9..cfa39b6a38a 100644 --- a/maps/dungeon_spawns/shuttle_unique.dmm +++ b/maps/dungeon_spawns/shuttle_unique.dmm @@ -322,6 +322,10 @@ pixel_x = 0; pixel_y = 24 }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, /turf/simulated/floor/tiled/dark, /area/crashed_ship) "aU" = ( @@ -339,7 +343,11 @@ /turf/simulated/floor/tiled/white, /area/crashed_ship) "aW" = ( -/obj/machinery/power/smes/buildable, +/obj/machinery/power/rtg/advanced, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, /turf/simulated/floor/tiled/dark, /area/crashed_ship) "aX" = ( @@ -413,10 +421,6 @@ /obj/item/weapon/reagent_containers/blood/ripped, /turf/simulated/floor/tiled/white, /area/crashed_ship) -"bh" = ( -/obj/machinery/power/rtg/advanced, -/turf/simulated/floor/tiled/dark, -/area/crashed_ship) "bi" = ( /obj/structure/table/rack, /obj/item/clothing/head/helmet, @@ -477,6 +481,7 @@ "bs" = ( /obj/machinery/power/rtg/advanced, /obj/machinery/light/small, +/obj/structure/cable/yellow, /turf/simulated/floor/tiled/dark, /area/crashed_ship) "bt" = ( @@ -544,6 +549,19 @@ }, /turf/unsimulated/chasm_mask, /area/crashed_ship) +"DG" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/dark, +/area/crashed_ship) (1,1,1) = {" aa @@ -1383,10 +1401,10 @@ aa aa ae aT -ai -ai -ai -ai +DG +DG +DG +DG bs ae aa @@ -1418,9 +1436,9 @@ aa ae ae aW -bh -bh -bh +aW +aW +aW ae ae aa