"
/mob/camera/blob/say(var/message)
if (!message)
diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm
index 913b6dd295d..516a407cbef 100644
--- a/code/game/gamemodes/changeling/powers/absorb.dm
+++ b/code/game/gamemodes/changeling/powers/absorb.dm
@@ -92,7 +92,7 @@
new_dna.struc_enzymes = T.dna.struc_enzymes
new_dna.real_name = T.dna.real_name
new_dna.species = T.dna.species
- new_dna.mutant_color = T.dna.mutant_color
+ new_dna.features = T.dna.features
new_dna.blood_type = T.dna.blood_type
absorbedcount++
store_dna(new_dna, user)
diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm
index fc897feff6b..40884bda963 100644
--- a/code/game/gamemodes/changeling/powers/mutations.dm
+++ b/code/game/gamemodes/changeling/powers/mutations.dm
@@ -303,8 +303,7 @@
icon_state = "lingarmor"
flags = NODROP
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
- slowdown = 2
- armor = list(melee = 65, bullet = 20, laser = 10, energy = 13, bomb = 0, bio = 0, rad = 0)
+ armor = list(melee = 40, bullet = 20, laser = 30, energy = 13, bomb = 0, bio = 0, rad = 0)
flags_inv = HIDEJUMPSUIT
cold_protection = 0
heat_protection = 0
@@ -322,7 +321,7 @@
desc = "A tough, hard covering of black chitin with transparent chitin in front."
icon_state = "lingarmorhelmet"
flags = HEADCOVERSEYES | BLOCKHAIR | NODROP
- armor = list(melee = 70, bullet = 15, laser = 7,energy = 10, bomb = 5, bio = 2, rad = 0)
+ armor = list(melee = 40, bullet = 15, laser = 30,energy = 10, bomb = 5, bio = 2, rad = 0)
flags_inv = HIDEEARS
/obj/item/clothing/head/helmet/changeling/dropped()
diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm
index 936f3f47662..bbadbcd6cac 100644
--- a/code/game/gamemodes/changeling/powers/tiny_prick.dm
+++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm
@@ -91,7 +91,7 @@
var/datum/dna/NewDNA = selected_dna
if(ismonkey(target))
user << "We stealthily sting [target.name]."
- hardset_dna(target, NewDNA.uni_identity, NewDNA.struc_enzymes, NewDNA.real_name, NewDNA.blood_type, NewDNA.species.type, NewDNA.mutant_color)
+ hardset_dna(target, NewDNA.uni_identity, NewDNA.struc_enzymes, NewDNA.real_name, NewDNA.blood_type, NewDNA.species.type, NewDNA.features)
updateappearance(target)
feedback_add_details("changeling_powers","TS")
return 1
diff --git a/code/game/gamemodes/changeling/powers/transform.dm b/code/game/gamemodes/changeling/powers/transform.dm
index 7b13ecf03da..2f57a81ebb7 100644
--- a/code/game/gamemodes/changeling/powers/transform.dm
+++ b/code/game/gamemodes/changeling/powers/transform.dm
@@ -17,8 +17,7 @@
user.dna = chosen_dna
user.real_name = chosen_dna.real_name
- hardset_dna(user, null, null, null, null, chosen_dna.species.type)
- user.dna.mutant_color = chosen_dna.mutant_color
+ hardset_dna(user, null, null, null, null, chosen_dna.species.type, chosen_dna.features)
updateappearance(user)
domutcheck(user)
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 4bfeecb2247..eddb0216d76 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -188,7 +188,7 @@
return 0
- if(living_antag_player && living_antag_player.mind && living_antag_player.stat != DEAD && !isnewplayer(living_antag_player) &&!isbrain(living_antag_player))
+ if(living_antag_player && living_antag_player.mind && isliving(living_antag_player) && living_antag_player.stat != DEAD && !isnewplayer(living_antag_player) &&!isbrain(living_antag_player))
return 0 //A resource saver: once we find someone who has to die for all antags to be dead, we can just keep checking them, cycling over everyone only when we lose our mark.
for(var/mob/Player in living_mob_list)
diff --git a/code/game/gamemodes/gang/dominator.dm b/code/game/gamemodes/gang/dominator.dm
new file mode 100644
index 00000000000..0bb8c7b21de
--- /dev/null
+++ b/code/game/gamemodes/gang/dominator.dm
@@ -0,0 +1,212 @@
+/obj/machinery/dominator
+ name = "dominator"
+ desc = "A visibly sinister device. Looks like you can break it if you hit it enough."
+ icon = 'icons/obj/machines/dominator.dmi'
+ icon_state = "dominator"
+ density = 1
+ anchored = 1.0
+ layer = 3.6
+ var/health = 200
+ var/gang
+ var/operating = 0
+ var/broken = 0
+
+/obj/machinery/dominator/New()
+ if(!istype(ticker.mode, /datum/game_mode/gang))
+ qdel(src)
+ return
+ SetLuminosity(2)
+
+/obj/machinery/dominator/examine(mob/user)
+ ..()
+ if(broken)
+ user << "It looks completely busted."
+ return
+
+ var/datum/game_mode/gang/mode = ticker.mode
+ var/time = null
+ if(gang == "A")
+ if(isnum(mode.A_timer))
+ time = max(mode.A_timer, 0)
+ if(gang == "B")
+ if(isnum(mode.B_timer))
+ time = max(mode.B_timer, 0)
+ if(isnum(time))
+ if(time > 0)
+ user << "Hostile Takeover in progress. Estimated [time] seconds remain."
+ else
+ user << "Hostile Takeover of [station_name()] successful. Have a great day."
+ else
+ user << "System on standby."
+ user << "System Integrity: [health/2]%"
+
+
+/obj/machinery/dominator/proc/healthcheck(var/damage)
+ var/iconname = "dominator"
+ if(gang)
+ iconname += "-[gang]"
+ SetLuminosity(3)
+
+ var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread
+
+ health -= damage
+
+ switch(health)
+ if(101 to INFINITY)
+ if(prob(damage*2))
+ sparks.set_up(5, 1, src)
+ sparks.start()
+ if(1 to 100)
+ sparks.set_up(5, 1, src)
+ sparks.start()
+ iconname += "-damaged"
+
+ if(!broken)
+ if(health <= 0)
+ set_broken()
+ else
+ icon_state = iconname
+
+ if(health <= -50)
+ new /obj/item/stack/sheet/plasteel(src.loc)
+ qdel(src)
+
+/obj/machinery/dominator/proc/set_broken()
+ var/datum/game_mode/gang/mode = ticker.mode
+ if(gang == "A")
+ mode.A_timer = "OFFLINE"
+ if(gang == "B")
+ mode.B_timer = "OFFLINE"
+ if(!isnum(mode.A_timer) && !isnum(mode.B_timer))
+ SSshuttle.emergencyNoEscape = 0
+ if(SSshuttle.emergency.mode == SHUTTLE_STRANDED)
+ SSshuttle.emergency.mode = SHUTTLE_DOCKED
+ SSshuttle.emergency.timer = world.time
+ priority_announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority")
+ else
+ priority_announce("All hostile activity within station systems have ceased.","Network Alert")
+ if(gang)
+ ticker.mode.message_gangtools(((gang=="A") ? ticker.mode.A_tools : ticker.mode.B_tools),"Hostile takeover cancelled: Dominator is no longer operational.",1,1)
+ SetLuminosity(0)
+ icon_state = "dominator-broken"
+ broken = 1
+
+/obj/machinery/dominator/Destroy()
+ if(!broken)
+ set_broken()
+ ..()
+
+/obj/machinery/dominator/emp_act(severity)
+ healthcheck(100)
+ ..()
+
+/obj/machinery/dominator/ex_act(severity, target)
+ if(target == src)
+ qdel(src)
+ return
+ switch(severity)
+ if(1.0)
+ qdel(src)
+ if(2.0)
+ healthcheck(120)
+ if(3.0)
+ healthcheck(30)
+ return
+
+/obj/machinery/dominator/bullet_act(var/obj/item/projectile/Proj)
+ if(Proj.damage)
+ if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
+ playsound(src, 'sound/effects/bang.ogg', 50, 1)
+ visible_message("[src] was hit by [Proj].")
+ healthcheck(Proj.damage)
+ ..()
+
+/obj/machinery/dominator/blob_act()
+ healthcheck(110)
+
+/obj/machinery/dominator/attackby(I as obj, user as mob, params)
+
+ return
+
+/obj/machinery/dominator/attack_hand(mob/user)
+ if(operating||broken)
+ examine(user)
+ return
+
+ var/datum/game_mode/gang/mode = ticker.mode
+ var/gang_territory
+ var/timer
+
+ var/tempgang
+ if(user.mind in (ticker.mode.A_gang|ticker.mode.A_bosses))
+ tempgang = "A"
+ gang_territory = ticker.mode.A_territory.len
+ timer = mode.A_timer
+ else if(user.mind in (ticker.mode.B_gang|ticker.mode.B_bosses))
+ tempgang = "B"
+ gang_territory = ticker.mode.B_territory.len
+ timer = mode.B_timer
+
+ if(!tempgang)
+ examine(user)
+ return
+
+ if(isnum(timer)) //In theory, this shouldn't happen. But if it does, they get this meme
+ user << "Error: Hostile Takeover is already in progress."
+ return
+
+ var/time = max(180,900 - ((round((gang_territory/start_state.num_territories)*200, 1) - 60) * 15))
+ if(alert(user,"With [round((gang_territory/start_state.num_territories)*100, 1)]% station control, a takeover will require [time] seconds.\nYour gang will be unable to gain influence while it is active.\nThe entire station will likely be alerted to it once it starts.\nAre you ready?","Confirm","Ready","Later") == "Ready")
+ if ((!in_range(src, user) || !istype(src.loc, /turf)))
+ return 0
+ var/area/srcloc = get_area(src.loc)
+ gang = tempgang
+ mode.domination(gang,1,srcloc.name)
+ src.name = "[gang_name(gang)] Gang [src.name]"
+ healthcheck(0)
+ operating = 1
+ ticker.mode.message_gangtools(((gang=="A") ? ticker.mode.A_tools : ticker.mode.B_tools),"Hostile takeover in progress: Estimated [time] seconds until victory.")
+
+/obj/machinery/dominator/attack_alien(mob/living/user)
+ user.do_attack_animation(src)
+ playsound(src, 'sound/effects/bang.ogg', 50, 1)
+ user.visible_message("[user] smashes against [src] with its claws.",\
+ "You smash against [src] with your claws.",\
+ "You hear metal scraping.")
+ healthcheck(15)
+
+/obj/machinery/dominator/attack_animal(mob/living/user as mob)
+ if(!isanimal(user))
+ return
+ var/mob/living/simple_animal/M = user
+ M.do_attack_animation(src)
+ if(M.melee_damage_upper <= 0)
+ return
+ healthcheck(M.melee_damage_upper)
+
+/obj/machinery/dominator/mech_melee_attack(obj/mecha/M)
+ if(M.damtype == "brute")
+ playsound(src, 'sound/effects/bang.ogg', 50, 1)
+ visible_message("[M.name] has hit [src].")
+ healthcheck(M.force)
+ return
+
+/obj/machinery/dominator/attack_hulk(mob/user)
+ playsound(src, 'sound/effects/bang.ogg', 50, 1)
+ user.visible_message("[user] smashes [src].",\
+ "You punch [src].",\
+ "You hear metal being slammed.")
+ healthcheck(5)
+
+/obj/machinery/dominator/attackby(obj/item/weapon/I as obj, mob/living/user as mob, params)
+ if(istype(I, /obj/item/weapon))
+ add_fingerprint(user)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
+ if( (I.flags&NOBLUDGEON) || !I.force )
+ return
+ playsound(src, 'sound/weapons/smash.ogg', 50, 1)
+ visible_message("[user] has hit \the [src] with [I].")
+ if(I.damtype == BURN || I.damtype == BRUTE)
+ healthcheck(I.force)
+ return
diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm
index 6967dc894c7..2b448e0b833 100644
--- a/code/game/gamemodes/gang/gang.dm
+++ b/code/game/gamemodes/gang/gang.dm
@@ -15,6 +15,10 @@
var/list/A_territory_lost = list()
var/list/B_territory_new = list()
var/list/B_territory_lost = list()
+ var/gang_A_style
+ var/gang_A_headgear
+ var/gang_B_style
+ var/gang_B_headgear
/datum/game_mode/gang
name = "gang war"
@@ -26,14 +30,15 @@
recommended_enemies = 2
enemy_minimum_age = 14
var/finished = 0
- var/goal_scalar = 0.5 //Goal = Total territories x goal_scalar
-
+ // Victory timers
+ var/A_timer = "OFFLINE"
+ var/B_timer = "OFFLINE"
///////////////////////////
//Announces the game type//
///////////////////////////
/datum/game_mode/gang/announce()
world << "The current game mode is - Gang War!"
- world << "A violent turf war has erupted on the station! Gangsters - Take over the station by claiming more than [round(100*goal_scalar,1)]% of the station! Crew - The gangs will try to keep you on the station. Successfully evacuate the station to win!"
+ world << "A violent turf war has erupted on the station! Gangsters - Take over the station by activating and defending a Dominator! Crew - The gangs will try to keep you on the station. Successfully evacuate the station to win!"
///////////////////////////////////////////////////////////////////////////////
@@ -73,6 +78,15 @@
modePlayer += B_bosses
..()
+/datum/game_mode/gang/process(seconds)
+ if(!finished)
+ if(isnum(A_timer))
+ A_timer -= seconds
+ if(isnum(B_timer))
+ B_timer -= seconds
+
+ ticker.mode.check_win()
+
/datum/game_mode/gang/proc/assign_bosses()
var/datum/mind/boss = pick(antag_candidates)
A_bosses += boss
@@ -91,7 +105,7 @@
/datum/game_mode/proc/forge_gang_objectives(var/datum/mind/boss_mind)
var/datum/objective/rival_obj = new
rival_obj.owner = boss_mind
- rival_obj.explanation_text = "Claim more than 50% the station before the [(boss_mind in A_bosses) ? gang_name("B") : gang_name("A")] Gang does."
+ rival_obj.explanation_text = "Preform a hostile takeover of the station with a Dominator."
boss_mind.objectives += rival_obj
@@ -103,6 +117,17 @@
boss_mind.current << "Objective #[obj_count]: [objective.explanation_text]"
obj_count++
+/datum/game_mode/gang/proc/domination(var/gang,var/modifier=1,var/dominatorloc)
+ if(gang=="A")
+ A_timer = max(180,900 - ((round((ticker.mode.A_territory.len/start_state.num_territories)*200, 1) - 60) * 15)) * modifier
+ if(gang=="B")
+ B_timer = max(180,900 - ((round((ticker.mode.B_territory.len/start_state.num_territories)*200, 1) - 60) * 15)) * modifier
+ if(gang && dominatorloc)
+ priority_announce("Hostile runtimes detected in all station systems. A network breach by the [gang_name(gang)] Gang has been located in [dominatorloc].","Network Alert")
+ if(get_security_level() != "delta")
+ set_security_level("red")
+ SSshuttle.emergencyNoEscape = 1
+
///////////////////////////////////////////////////////////////////////////
//This equips the bosses with their gear, and makes the clown not clumsy//
///////////////////////////////////////////////////////////////////////////
@@ -132,37 +157,91 @@
var/where = mob.equip_in_one_of_slots(gangtool, slots)
if (!where)
mob << "Your Syndicate benefactors were unfortunately unable to get you a Gangtool."
+ . += 1
else
gangtool.register_device(mob)
- mob << "The Gangtool in your [where] will allow you to use your influence to purchase items and prevent the station from evacuating before you can take over. Use it to recall the emergency shuttle from anywhere on the station."
+ mob << "The Gangtool in your [where] will allow you to purchase items, send messages to your gangsters and recall the emergency shuttle from anywhere on the station."
mob << "You can also promote your gang members to lieutenant by giving them an unregistered gangtool. Lieutenants cannot be deconverted and are able to use recruitment pens and gangtools."
- . += 1
var/where2 = mob.equip_in_one_of_slots(T, slots)
if (!where2)
mob << "Your Syndicate benefactors were unfortunately unable to get you a recruitment pen to start."
- else
- mob << "The recruitment pen in your [where2] will help you get your gang started. Use it on unsuspecting crew members to recruit them."
. += 1
+ else
+ mob << "The recruitment pen in your [where2] will help you get your gang started. Stab unsuspecting crew members with it to recruit them."
var/where3 = mob.equip_in_one_of_slots(SC, slots)
if (!where3)
mob << "Your Syndicate benefactors were unfortunately unable to get you a territory spraycan to start."
- else
- mob << "The territory spraycan in your [where3] can be used to claim areas of the station for your gang. The more territory your gang controls, the more influence you get. Distribute these to your gangsters to grow your influence faster."
. += 1
+ else
+ mob << "The territory spraycan in your [where3] can be used to claim areas of the station for your gang. The more territory your gang controls, the more influence you get. All gangsters can use these, so distribute them to grow your influence faster."
mob.update_icons()
return .
+//Used by recallers when purchasing a gang outfit. First time a gang outfit is purchased the buyer decides a gang style which is stored so gang outfits are uniform
+/datum/game_mode/proc/gang_outfit(mob/user,var/obj/item/device/gangtool/gangtool,var/gang)
+ if(!user || !gangtool || !gang)
+ return 0
+ if(!gangtool.can_use(user))
+ return 0
+
+ var/gang_style_list = list("Gang Colors","Leather Jackets","Black Suits","White Suits")
+ var/style
+ if(gang == "A")
+ if(!gang_A_style)
+ gang_A_style = input("Pick an outfit style.", "Pick Style") as null|anything in gang_style_list
+ style = gang_A_style
+
+ if(gang == "B")
+ if(!gang_B_style)
+ gang_B_style = input("Pick an outfit style.", "Pick Style") as null|anything in gang_style_list
+ style = gang_B_style
+
+ if(!style)
+ return 0
+
+ if(gangtool.can_use(user) && (((gang == "A") ? gang_points.A : gang_points.B) >= 1))
+ switch(style)
+ if("Gang Colors")
+ if(gang == "A")
+ new /obj/item/clothing/under/color/blue(user.loc)
+ if(gang == "B")
+ new /obj/item/clothing/under/color/red(user.loc)
+ if("Leather Jackets")
+ new /obj/item/clothing/suit/jacket/leather(user.loc)
+ if("Black Suits")
+ new /obj/item/clothing/under/suit_jacket/charcoal(user.loc)
+ if("White Suits")
+ new /obj/item/clothing/under/suit_jacket/white(user.loc)
+
+ return 1
+
+ return 0
+
/////////////////////////////////////////////
//Checks if the either gang have won or not//
/////////////////////////////////////////////
/datum/game_mode/gang/check_win()
- if(A_territory.len > (start_state.num_territories * goal_scalar))
- finished = "A" //Gang A wins
- else if(B_territory.len > (start_state.num_territories * goal_scalar))
- finished = "B" //Gang B wins
+ var/winner = 0
+
+ if(isnum(A_timer))
+ if(A_timer < 0)
+ winner += 1
+ if(isnum(B_timer))
+ if(B_timer < 0)
+ winner += 2
+
+ if(winner)
+ if(winner == 3) //Edge Case: If both dominators activate at the same time
+ domination("A",0.5)
+ domination("B",0.5)
+ priority_announce("Multiple station takeover attempts have made simultaneously. Conflicting hostile runtimes appears to have delayed both attempts.","Network Alert")
+ else if(winner == 1)
+ finished = "A" //Gang A wins
+ else if(winner == 2)
+ finished = "B" //Gang B wins
///////////////////////////////
//Checks if the round is over//
@@ -282,7 +361,7 @@
if(!finished)
world << "The station was [station_was_nuked ? "destroyed!" : "evacuated before either gang could claim it!"]"
else
- world << "The [finished=="A" ? gang_name("A") : gang_name("B")] Gang has claimed over [round(100*goal_scalar,1)]% of the station and has assumed control!"
+ world << "The [finished=="A" ? gang_name("A") : gang_name("B")] Gang successfully preformed a hostile takeover of the station!!"
..()
return 1
@@ -338,8 +417,8 @@
//////////////////////////////////////////////////////////
/datum/gang_points
- var/A = 30
- var/B = 30
+ var/A = 25
+ var/B = 25
var/next_point_interval = 1800
var/next_point_time
@@ -371,25 +450,43 @@
B_lost_names += "[ticker.mode.B_territory_lost[area]], "
ticker.mode.B_territory -= area
+ var/datum/game_mode/gang/gangmode
+ if(istype(ticker.mode, /datum/game_mode/gang))
+ gangmode = ticker.mode
+
//Calculate and report influence growth
- ticker.mode.message_gangtools(ticker.mode.A_tools,"[gang_name("A")] Gang Status Report:")
- var/A_new = min(999,A + 15 + ticker.mode.A_territory.len)
+ ticker.mode.message_gangtools(ticker.mode.A_tools,"*---------* [gang_name("A")] Gang Status Report:")
var/A_message = ""
- if(A_new != A)
- A_message += "Your gang has gained [A_new - A] Influence for holding on to [ticker.mode.A_territory.len] territories."
- if(A_new == 999)
- A_message += " You cannot gain any more influence without spending some with this device."
- A = A_new
+ if(gangmode && isnum(gangmode.A_timer))
+ var/new_time = max(180,gangmode.A_timer - (ticker.mode.A_territory.len * 2))
+ if(new_time < gangmode.A_timer)
+ A_message += "Your takeover has been rushed by [gangmode.A_timer - new_time] seconds for holding on to [ticker.mode.A_territory.len] territories. "
+ gangmode.A_timer = new_time
+ A_message += "[gangmode.A_timer] seconds remain in hostile takeover."
+ else
+ var/A_new = min(999,A + 15 + ticker.mode.A_territory.len)
+ if(A_new != A)
+ A_message += "Your gang has gained [A_new - A] Influence for holding on to [ticker.mode.A_territory.len] territories."
+ if(A_new == 999)
+ A_message += " You cannot gain any more influence without spending some with this device."
+ A = A_new
ticker.mode.message_gangtools(ticker.mode.A_tools,A_message,0)
ticker.mode.message_gangtools(ticker.mode.B_tools,"[gang_name("B")] Gang Status Report:")
- var/B_new = min(999,B + 15 + ticker.mode.B_territory.len)
var/B_message = ""
- if(B_new != B)
- B_message += "Your gang has gained [B_new - B] Influence for holding on to [ticker.mode.B_territory.len] territories."
- if(B_new == 999)
- B_message += " You cannot gain any more influence without spending some with this device."
- B = B_new
+ if(gangmode && isnum(gangmode.B_timer))
+ var/new_time = max(180,gangmode.B_timer - (ticker.mode.B_territory.len * 2))
+ if(new_time < gangmode.B_timer)
+ B_message += "Your takeover has been rushed by [gangmode.B_timer - new_time] seconds for holding on to [ticker.mode.B_territory.len] territories. "
+ gangmode.B_timer = new_time
+ B_message += "[gangmode.B_timer] seconds remain in hostile takeover."
+ else
+ var/B_new = min(999,B + 15 + ticker.mode.B_territory.len)
+ if(B_new != B)
+ B_message += "Your gang has gained [B_new - B] Influence for holding on to [ticker.mode.B_territory.len] territories."
+ if(B_new == 999)
+ B_message += " You cannot gain any more influence without spending some with this device."
+ B = B_new
ticker.mode.message_gangtools(ticker.mode.B_tools,B_message,0)
@@ -428,13 +525,12 @@
var/A_control = round((ticker.mode.A_territory.len/start_state.num_territories)*100, 1)
var/B_control = round((ticker.mode.B_territory.len/start_state.num_territories)*100, 1)
- ticker.mode.message_gangtools((ticker.mode.A_tools),"Your gang now has [A_control]% control of the station.",0)
- ticker.mode.message_gangtools((ticker.mode.A_tools),"The [gang_name("B")] Gang has [B_control]% control of the station.",0,1)
- ticker.mode.message_gangtools((ticker.mode.B_tools),"Your gang now has [B_control]% control of the station.",0)
- ticker.mode.message_gangtools((ticker.mode.B_tools),"The [gang_name("A")] Gang has [A_control]% control of the station.",0,1)
+ ticker.mode.message_gangtools((ticker.mode.A_tools),"Your gang now has [A_control]% control of the station. *---------*",0)
+ ticker.mode.message_gangtools((ticker.mode.B_tools),"Your gang now has [B_control]% control of the station. *---------*",0)
- //Victory check
- ticker.mode.check_win()
+ //Increase outfit stock
+ for(var/obj/item/device/gangtool/tool in (ticker.mode.A_tools | ticker.mode.B_tools))
+ tool.outfits = min(tool.outfits+3,10)
//Restart the counter
start()
diff --git a/code/game/objects/items/devices/recaller.dm b/code/game/gamemodes/gang/recaller.dm
similarity index 70%
rename from code/game/objects/items/devices/recaller.dm
rename to code/game/gamemodes/gang/recaller.dm
index de3f046635c..b081a80686e 100644
--- a/code/game/objects/items/devices/recaller.dm
+++ b/code/game/gamemodes/gang/recaller.dm
@@ -2,7 +2,7 @@
/obj/item/device/gangtool
name = "suspicious device"
desc = "A strange device of sorts. Hard to really make out what it actually does just by looking."
- icon_state = "recaller"
+ icon_state = "gangtool"
item_state = "walkietalkie"
throwforce = 0
w_class = 1.0
@@ -13,6 +13,7 @@
var/boss = 1 //If it has the power to promote gang members
var/recalling = 0
var/promotions = 0
+ var/outfits = 5
/obj/item/device/gangtool/New() //Initialize supply point income if it hasn't already been started
if(!ticker.mode.gang_points)
@@ -33,30 +34,35 @@
else
dat += "Register Device "
else
+ var/datum/game_mode/gang/gangmode
+ if(istype(ticker.mode, /datum/game_mode/gang))
+ gangmode = ticker.mode
+
var/gang_size = ((gang == "A")? (ticker.mode.A_gang.len + ticker.mode.A_bosses.len) : (ticker.mode.B_gang.len + ticker.mode.B_bosses.len))
var/gang_territory = ((gang == "A")? ticker.mode.A_territory.len : ticker.mode.B_territory.len)
var/points = ((gang == "A") ? ticker.mode.gang_points.A : ticker.mode.gang_points.B)
+ var/timer
+ if(gangmode)
+ timer = ((gang == "A") ? gangmode.A_timer : gangmode.B_timer)
+ if(isnum(timer))
+ dat += "
Takeover In Progress: [timer] seconds remain
"
dat += "Registration: [(gang == "A")? gang_name("A") : gang_name("B")] Gang [boss ? "Administrator" : "Lieutenant"] "
- dat += "Organization Size: [gang_size] "
- dat += "Station Control: [round((gang_territory/start_state.num_territories)*100, 1)]% "
- dat += "Recall Emergency Shuttle "
+ dat += "Organization Size: [gang_size] | Station Control: [round((gang_territory/start_state.num_territories)*100, 1)]% "
+ if(outfits > 0)
+ dat += "Create Gang Outfit "
+ else
+ dat += "Create Gang Outfit (Restocking) "
+ dat += "Send Gang-wide Message "
+ if(gangmode)
+ dat += "Recall Emergency Shuttle "
+
dat += " "
+
dat += "Influence: [points] "
- dat += "Time until Influence grows: [(points >= 100) ? ("--:--") : (time2text(ticker.mode.gang_points.next_point_time - world.time, "mm:ss"))] "
- dat += "Purchase Items: "
-
- dat += "(5 Influence) "
- if(points >= 5)
- dat += "Send Gang-wide Message "
- else
- dat += "Send Gang-wide Message "
-
- dat += "(10 Influence) "
- if(points >= 10)
- dat += "Territory Spraycan "
- else
- dat += "Territory Spraycan "
+ dat += "Time until Influence grows: [(points >= 999) ? ("--:--") : (time2text(ticker.mode.gang_points.next_point_time - world.time, "mm:ss"))] "
+ dat += ""
+ dat += "Purchase Weapons: "
dat += "(10 Influence) "
if(points >= 10)
@@ -64,8 +70,8 @@
else
dat += "Switchblade "
- dat += "(25 Influence) "
- if(points >= 25)
+ dat += "(20 Influence) "
+ if(points >= 20)
dat += "10mm Pistol "
else
dat += "10mm Pistol "
@@ -76,8 +82,29 @@
else
dat += "10mm Ammo "
- dat += "(40 Influence) "
- if(points >= 40)
+ dat += "(50 Influence) "
+ if(points >= 50)
+ dat += "Thompson SMG "
+ else
+ dat += "Thompson SMG "
+
+ dat += " "
+ dat += "Purchase Utilities: "
+
+ dat += "(5 Influence) "
+ if(points >= 5)
+ dat += "Territory Spraycan "
+ else
+ dat += "Territory Spraycan "
+
+ dat += "(10 Influence) "
+ if(points >= 10)
+ dat += "Bulletproof Vest "
+ else
+ dat += "Bulletproof Vest "
+
+ dat += "(30 Influence) "
+ if(points >= 30)
dat += "Recruitment Pen "
else
dat += "Recruitment Pen "
@@ -86,19 +113,28 @@
if(promotions >= 3)
dat += "(Out of stock) Promote a Gangster "
else
- dat += "([(promotions*20)+10] Influence, [3-promotions] left) "
- if(points >= (promotions*20)+10)
+ dat += "([(promotions*10)+10] Influence, [3-promotions] left) "
+ if(points >= (promotions*10)+10)
dat += "Promote a Gangster "
else
dat += "Promote a Gangster "
+ if(gangmode)
+ dat += "(30 Influence) "
+ if(points >= 30)
+ dat += "Station Dominator "
+ else
+ dat += "Station Dominator "
+ dat += "(Estimated Takeover Time: [round(max(180,900 - ((round((gang_territory/start_state.num_territories)*200, 10) - 60) * 15))/60,1)] minutes) "
dat += " "
dat += "Refresh "
- var/datum/browser/popup = new(user, "gangtool", "Welcome to GangTool v0.4")
+ var/datum/browser/popup = new(user, "gangtool", "Welcome to GangTool v0.4", 340, 600)
popup.set_content(dat)
popup.open()
+
+
/obj/item/device/gangtool/Topic(href, href_list)
if(!can_use(usr))
return
@@ -116,44 +152,77 @@
var/item_type
switch(href_list["purchase"])
if("spraycan")
- if(points >= 10)
+ if(points >= 5)
item_type = /obj/item/toy/crayon/spraycan/gang
- points = 10
+ points = 5
if("switchblade")
if(points >= 10)
item_type = /obj/item/weapon/switchblade
points = 10
if("pistol")
- if(points >= 25)
+ if(points >= 20)
item_type = /obj/item/weapon/gun/projectile/automatic/pistol
- points = 25
+ points = 20
if("ammo")
if(points >= 10)
item_type = /obj/item/ammo_box/magazine/m10mm
points = 10
+ if("SMG")
+ if(points >= 50)
+ item_type = /obj/item/weapon/gun/projectile/automatic/tommygun
+ points = 50
+ if("vest")
+ if(points >= 10)
+ item_type = /obj/item/clothing/suit/armor/bulletproof
+ points = 10
if("pen")
- if(points >= 40)
+ if(points >= 30)
item_type = /obj/item/weapon/pen/gang
- points = 40
+ points = 30
if("gangtool")
- if((promotions < 3) && (points >= (promotions*20)+10))
+ if((promotions < 3) && (points >= (promotions*10)+10))
item_type = /obj/item/device/gangtool/lt
- points = (promotions*20)+10
+ points = (promotions*10)+10
promotions++
+ if("dominator")
+ if(istype(ticker.mode, /datum/game_mode/gang))
+ var/datum/game_mode/gang/mode = ticker.mode
+ if(isnum((gang == "A") ? mode.A_timer : mode.B_timer))
+ return
+
+ var/usrarea = get_area(usr.loc)
+ var/usrturf = get_turf(usr.loc)
+ if(istype(usrarea,/area/space) || istype(usrturf,/turf/space) || usr.z != 1)
+ usr << "You can only use this on the station!"
+ return
+
+ for(var/obj/obj in usrturf)
+ if(obj.density)
+ usr << "There's not enough room here!"
+ return
+
+ if(points >= 30)
+ item_type = /obj/machinery/dominator
+ points = 30
if(item_type)
if(gang == "A")
ticker.mode.gang_points.A -= points
else if(gang == "B")
ticker.mode.gang_points.B -= points
- var/obj/purchased = new item_type(get_turf(usr))
- var/mob/living/carbon/human/H = usr
- H.put_in_any_hand_if_possible(purchased)
+ if(ispath(item_type))
+ var/obj/purchased = new item_type(get_turf(usr))
+ var/mob/living/carbon/human/H = usr
+ H.put_in_any_hand_if_possible(purchased)
ticker.mode.message_gangtools(((gang=="A")? ticker.mode.A_tools : ticker.mode.B_tools), "A [href_list["purchase"]] was purchased by [usr] for [points] Influence.")
log_game("A [href_list["purchase"]] was purchased by [key_name(usr)] for [points] Influence.")
else if(href_list["choice"])
switch(href_list["choice"])
+ if("outfit")
+ if(outfits > 0)
+ ticker.mode.gang_outfit(usr,src,gang)
+ outfits -= 1
if("recall")
recall(usr)
if("ping")
@@ -172,19 +241,17 @@
return
var/list/members = list()
if(gang == "A")
- if(ticker.mode.gang_points.A >= 5)
- members += ticker.mode.A_bosses | ticker.mode.A_gang
- ticker.mode.gang_points.A -= 5
+ members += ticker.mode.A_bosses | ticker.mode.A_gang
else if(gang == "B")
- if(ticker.mode.gang_points.B >= 5)
- members += ticker.mode.B_bosses | ticker.mode.B_gang
- ticker.mode.gang_points.B -= 5
+ members += ticker.mode.B_bosses | ticker.mode.B_gang
if(members.len)
+ var/ping = "[gang_name(gang)] [boss ? "Gang Boss" : "Gang Lieutenant"]: [message]"
for(var/datum/mind/ganger in members)
if(ganger.current.z <= 2)
- ganger.current << "BOSS: [message]"
- message_admins("[key_name_admin(user)] sent a global message to the [gang_name(gang)] Gang ([gang]): [message].")
- log_game("[key_name(user)] sent a global message to the [gang_name(gang)] Gang ([gang]): [message].")
+ ganger.current << ping
+ for(var/mob/M in dead_mob_list)
+ M << ping
+ log_game("[key_name(user)] Messaged [gang_name(gang)] Gang ([gang]): [message].")
/obj/item/device/gangtool/proc/register_device(var/mob/user)
@@ -196,6 +263,7 @@
if(user.mind in (ticker.mode.A_gang | ticker.mode.A_bosses))
ticker.mode.A_tools += src
gang = "A"
+ icon_state = "gangtool-a"
if(!(user.mind in ticker.mode.A_bosses))
ticker.mode.remove_gangster(user.mind, 0, 2)
ticker.mode.A_bosses += user.mind
@@ -206,6 +274,7 @@
else if(user.mind in (ticker.mode.B_gang | ticker.mode.B_bosses))
ticker.mode.B_tools += src
gang = "B"
+ icon_state = "gangtool-b"
if(!(user.mind in ticker.mode.B_bosses))
ticker.mode.remove_gangster(user.mind, 0, 2)
ticker.mode.B_bosses += user.mind
@@ -218,7 +287,7 @@
user << "You have been promoted to Lieutenant!"
ticker.mode.forge_gang_objectives(user.mind)
ticker.mode.greet_gang(user.mind,0)
- user << "The Gangtool you registered will allow you to use your gang's influence to purchase items and prevent the station from evacuating before your gang can take over. Use it to recall the emergency shuttle from anywhere on the station."
+ user << "The Gangtool you registered will allow you to purchase items, send messages to your gangsters and to recall the emergency shuttle from anywhere on the station."
user << "You may also now use recruitment pens to grow your gang membership. Use them on unsuspecting crew members to recruit them."
if(!gang)
usr << "ACCESS DENIED: Unauthorized user."
@@ -227,6 +296,9 @@
if(recalling || !can_use(user))
return
+ if(!istype(ticker.mode, /datum/game_mode/gang))
+ return
+
recalling = 1
loc << "\icon[src]Generating shuttle recall order with codes retrieved from last call signal..."
diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm
index e392f101ae7..6fe17405212 100644
--- a/code/game/gamemodes/intercept_report.dm
+++ b/code/game/gamemodes/intercept_report.dm
@@ -228,9 +228,9 @@
*/
/datum/intercept_text/proc/build_gang(datum/mind/correct_person)
- src.text += "
We have recieved reports of a sudden increase of criminal activity in close proximity to our operations within your sector."
- src.text += "Ensure law and order is maintained on the station and be on the lookout for unusually territorial behavior from the crew."
- src.text += "In the event of a full-scale takeover attempt, sensitive research items are to be secured and the station evacuated ASAP."
+ src.text += "
We have reports of criminal activity in close proximity to our operations within your sector."
+ src.text += "Ensure law and order is maintained on the station and be on the lookout for aggressive factionalism within the crew."
+ src.text += "In the event of a full-scale criminal takeover threat, sensitive research items are to be secured and the station evacuated ASAP."
src.text += " "
/datum/intercept_text/proc/build_wizard(datum/mind/correct_person)
@@ -289,3 +289,4 @@
*/
src.text += "These lifeforms are associated with the [orgname1] [orgname2] and may be attempting to acquire sensitive materials on their behalf. "
src.text += "Please take care not to alarm the crew, as [cname] may take advantage of a panic situation. Remember, they can be anybody, suspect everybody!"
+ src.text += " "
\ No newline at end of file
diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index 5ef07cdcbf5..90bb59dc92f 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -99,7 +99,7 @@
C.post_status("alert", "lockdown")
src.verbs += /mob/living/silicon/ai/proc/disablelockdown
- src << "Lockdown Initiated."
+ src << "Lockdown Initiated."
malf_cooldown = 1
spawn(30)
malf_cooldown = 0
@@ -127,7 +127,7 @@
else if(!D.stat) //Opens only powered doors.
D.open() //Open everything!
- src << "Lockdown Lifted."
+ src << "Lockdown Lifted."
malf_cooldown = 1
spawn(30)
malf_cooldown = 0
diff --git a/code/game/gamemodes/monkey/monkey.dm b/code/game/gamemodes/monkey/monkey.dm
index 18a62827b4f..d27155825c0 100644
--- a/code/game/gamemodes/monkey/monkey.dm
+++ b/code/game/gamemodes/monkey/monkey.dm
@@ -46,7 +46,7 @@
/datum/game_mode/monkey/proc/greet_carrier(var/datum/mind/carrier)
- carrier.current << "You are the Jungle Fever patient zero!!"
+ carrier.current << "You are the Jungle Fever patient zero!!"
carrier.current << "You have been planted onto this station by the Animal Rights Consortium."
carrier.current << "Soon the disease will transform you into an ape. Afterwards, you will be able spread the infection to others with a bite."
carrier.current << "While your infection strain is undetectable by scanners, any other infectees will show up on medical equipment."
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index 351f87f9c37..8a5b0de73ce 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -49,7 +49,7 @@
dat += "Captured Soul: [A.name] "
dat += {"Summon Shade"}
dat += " "
- dat += {" Close"}
+ dat += {"Close"}
user << browse(dat, "window=aicard")
onclose(user, "aicard")
return
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index 8a58076e663..2c9ea69ef97 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -182,6 +182,11 @@
log_name = "IS"
category = "Utility Spells"
+/datum/spellbook_entry/lichdom
+ name = "Bind Soul"
+ spell_type = /obj/effect/proc_holder/spell/targeted/lichdom
+ log_name = "LD"
+
/datum/spellbook_entry/lightningbolt
name = "Lightning Bolt"
spell_type = /obj/effect/proc_holder/spell/targeted/lightning
@@ -241,7 +246,7 @@
/datum/spellbook_entry/item/scryingorb
name = "Scrying Orb"
desc = "An incandescent orb of crackling energy, using it will allow you to ghost while alive, allowing you to spy upon the station with ease. In addition, buying it will permanently grant you x-ray vision."
- item_path = /obj/item/weapon/gun/magic/staff/chaos
+ item_path = /obj/item/weapon/scrying
log_name = "SO"
/datum/spellbook_entry/item/scryingorb/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book)
@@ -292,6 +297,12 @@
item_path = /obj/item/weapon/antag_spawner/contract
log_name = "CT"
+/datum/spellbook_entry/item/bloodbottle
+ name = "Bottle of Blood"
+ desc = "A bottle of magically infused blood, the smell of which will attract extradimensional beings when broken. Be careful though, the kinds of creatures summoned by blood magic are indiscriminate in their killing, and you yourself may become a victim."
+ item_path = /obj/item/weapon/antag_spawner/slaughter_demon
+ log_name = "BB"
+
/datum/spellbook_entry/summon
name = "Summon Stuff"
category = "Rituals"
@@ -416,6 +427,10 @@
user << "You feed the contract back into the spellbook, refunding your points."
src.uses++
qdel(O)
+ if(istype(O, /obj/item/weapon/antag_spawner/slaughter_demon))
+ user << "On second thought, maybe summoning a demon is a bad idea. You refund your points."
+ src.uses++
+ qdel(O)
/obj/item/weapon/spellbook/proc/GetCategoryHeader(var/category)
var/dat = ""
@@ -477,7 +492,7 @@
dat += "
"
//delete your own or somebody else's memo
/client/proc/admin_memo_delete()
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 740ec63b06e..1c073505ab8 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -10,6 +10,7 @@ var/list/admin_verbs_default = list(
/client/proc/deadchat, /*toggles deadchat on/off*/
/client/proc/dsay, /*talk in deadchat using our ckey/fakekey*/
/client/proc/toggleprayers, /*toggles prayers on/off*/
+ /client/verb/toggleprayersounds, /*Toggles prayer sounds (HALLELUJAH!)*/
/client/proc/toggle_hear_radio, /*toggles whether we hear the radio*/
/client/proc/investigate_show, /*various admintools for investigation. Such as a singulo grief-log*/
/client/proc/secrets,
@@ -120,7 +121,9 @@ var/list/admin_verbs_debug = list(
/client/proc/SDQL2_query,
/client/proc/test_movable_UI,
/client/proc/test_snap_UI,
- /client/proc/debugNatureMapGenerator
+ /client/proc/debugNatureMapGenerator,
+ /client/proc/check_bomb_impacts,
+ /proc/machine_upgrade
)
var/list/admin_verbs_possess = list(
/proc/possess,
@@ -547,7 +550,7 @@ var/list/admin_verbs_hideable = list(
var/list/Lines = file2list("config/admins.txt")
for(var/line in Lines)
var/list/splitline = text2list(line, " = ")
- if(splitline[1] == ckey)
+ if(lowertext(splitline[1]) == ckey)
if(splitline.len >= 2)
rank = ckeyEx(splitline[2])
break
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
new file mode 100644
index 00000000000..4390f383d8b
--- /dev/null
+++ b/code/modules/admin/secrets.dm
@@ -0,0 +1,612 @@
+/datum/admins/proc/Secrets()
+ if(!check_rights(0)) return
+
+ var/dat = "The first rule of adminbuse is: you don't talk about the adminbuse."
+
+ dat +={"
+ General Secrets
+
+ Show Job Debug
+ Admin Log
+ Show Admin List
+
+ "}
+
+ if(check_rights(R_ADMIN,0))
+ dat += {"
+ Admin Secrets
+
+ Cure all diseases currently in existence
+ Bombing List
+ Show current traitors and objectives
+ Show last [length(lastsignalers)] signalers
+ Show last [length(lawchanges)] law changes
+ Show AI Laws
+ Show Game Mode
+ Show Crew Manifest
+ List DNA (Blood)
+ List Fingerprints
The Emergency Shuttle has docked with the station. You have 3 minutes to board the Emergency Shuttle.
"
+ src << sound('sound/AI/shuttledock.ogg')
+ if(15)
+ src << 'sound/items/Welder.ogg'
+ if(16)
+ src << 'sound/items/Screwdriver.ogg'
+ if(17)
+ src << 'sound/weapons/saberon.ogg'
+ if(18)
+ src << 'sound/weapons/saberoff.ogg'
+ if("hudscrew")
+ //Screwy HUD
+ //src << "Screwy HUD"
+ hal_screwyhud = pick(1,2,3,3,4,4)
+ spawn(rand(100,250))
+ hal_screwyhud = 0
+ if("items")
+ //Strange items
+ //src << "Traitor Items"
+ if(!halitem)
+ halitem = new
+ var/list/slots_free = list(ui_lhand,ui_rhand)
+ if(l_hand) slots_free -= ui_lhand
+ if(r_hand) slots_free -= ui_rhand
+ if(istype(src,/mob/living/carbon/human))
+ var/mob/living/carbon/human/H = src
+ if(!H.belt) slots_free += ui_belt
+ if(!H.l_store) slots_free += ui_storage1
+ if(!H.r_store) slots_free += ui_storage2
+ if(slots_free.len)
+ halitem.screen_loc = pick(slots_free)
+ halitem.layer = 50
+ switch(rand(1,6))
+ if(1) //revolver
+ halitem.icon = 'icons/obj/guns/projectile.dmi'
+ halitem.icon_state = "revolver"
+ halitem.name = "Revolver"
+ if(2) //c4
+ halitem.icon = 'icons/obj/assemblies.dmi'
+ halitem.icon_state = "plastic-explosive0"
+ halitem.name = "Mysterious Package"
+ if(prob(25))
+ halitem.icon_state = "c4small_1"
+ if(3) //sword
+ halitem.icon = 'icons/obj/weapons.dmi'
+ halitem.icon_state = "sword1"
+ halitem.name = "Sword"
+ if(4) //stun baton
+ halitem.icon = 'icons/obj/weapons.dmi'
+ halitem.icon_state = "stunbaton"
+ halitem.name = "Stun Baton"
+ if(5) //emag
+ halitem.icon = 'icons/obj/card.dmi'
+ halitem.icon_state = "emag"
+ halitem.name = "Cryptographic Sequencer"
+ if(6) //flashbang
+ halitem.icon = 'icons/obj/grenade.dmi'
+ halitem.icon_state = "flashbang1"
+ halitem.name = "Flashbang"
+ if(client) client.screen += halitem
+ spawn(rand(100,250))
+ qdel(halitem)
+ if("dangerflash")
+ //Flashes of danger
+ //src << "Danger Flash"
+ if(!halimage)
+ var/list/possible_points = list()
+ for(var/turf/simulated/floor/F in view(src,world.view))
+ possible_points += F
+ if(possible_points.len)
+ var/turf/simulated/floor/target = pick(possible_points)
+
+ switch(rand(1,3))
+ if(1)
+ //src << "Space"
+ halimage = image('icons/turf/space.dmi',target,"[rand(1,25)]",TURF_LAYER)
+ if(2)
+ //src << "Fire"
+ halimage = image('icons/effects/fire.dmi',target,"1",TURF_LAYER)
+ if(3)
+ //src << "C4"
+ halimage = image('icons/obj/assemblies.dmi',target,"plastic-explosive2",OBJ_LAYER+0.01)
+
+
+ if(client) client.images += halimage
+ spawn(rand(10,50)) //Only seen for a brief moment.
+ if(client) client.images -= halimage
+ halimage = null
+ if("death")
+ //Fake death
+ src.sleeping = 20
+ hal_crit = 1
+ hal_screwyhud = 1
+ spawn(rand(50,100))
+ src.sleeping = 0
+ hal_crit = 0
+ hal_screwyhud = 0
+ if("husks")
+ if(!halbody)
+ var/list/possible_points = list()
+ for(var/turf/simulated/floor/F in view(src,world.view))
+ possible_points += F
+ if(possible_points.len)
+ var/turf/simulated/floor/target = pick(possible_points)
+ switch(rand(1,4))
+ if(1)
+ var/image/body = image('icons/mob/human.dmi',target,"husk_s",TURF_LAYER)
+ var/matrix/M = matrix()
+ M.Turn(90)
+ body.transform = M
+ halbody = body
+ if(2,3)
+ halbody = image('icons/mob/human.dmi',target,"husk_s",TURF_LAYER)
+ if(4)
+ halbody = image('icons/mob/alien.dmi',target,"alienother",TURF_LAYER)
+
+ if(client) client.images += halbody
+ spawn(rand(50,80)) //Only seen for a brief moment.
+ if(client) client.images -= halbody
+ halbody = null
\ No newline at end of file
diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm
index dbcff950089..1f07766a523 100644
--- a/code/modules/food&drinks/drinks/drinks.dm
+++ b/code/modules/food&drinks/drinks/drinks.dm
@@ -81,7 +81,7 @@
return
var/refill = reagents.get_master_reagent_id()
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
- user << " You transfer [trans] units of the solution to [target]."
+ user << "You transfer [trans] units of the solution to [target]."
if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
var/mob/living/silicon/robot/bro = user
diff --git a/code/modules/food&drinks/kitchen machinery/gibber.dm b/code/modules/food&drinks/kitchen machinery/gibber.dm
index 38a52ffa9ff..e5111bfb000 100644
--- a/code/modules/food&drinks/kitchen machinery/gibber.dm
+++ b/code/modules/food&drinks/kitchen machinery/gibber.dm
@@ -9,7 +9,9 @@
var/operating = 0 //Is it on?
var/dirty = 0 // Does it need cleaning?
var/gibtime = 40 // Time from starting until meat appears
- var/typeofmeat = /obj/item/weapon/reagent_containers/food/snacks/meat/
+ var/typeofmeat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human
+ var/meat_produced = 0
+ var/ignore_clothing = 0
use_power = 1
idle_power_usage = 2
active_power_usage = 500
@@ -47,6 +49,21 @@
/obj/machinery/gibber/New()
..()
src.overlays += image('icons/obj/kitchen.dmi', "grjam")
+ component_parts = list()
+ component_parts += new /obj/item/weapon/circuitboard/gibber(null)
+ component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
+ RefreshParts()
+
+/obj/machinery/gibber/RefreshParts()
+ var/gib_time = 40
+ for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)
+ meat_produced += 3 * B.rating
+ for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
+ gib_time -= 5 * M.rating
+ gibtime = gib_time
+ if(M.rating >= 2)
+ ignore_clothing = 1
/obj/machinery/gibber/update_icon()
overlays.Cut()
@@ -77,29 +94,43 @@
else
src.startgibbing(user)
-/obj/machinery/gibber/attackby(obj/item/weapon/grab/G as obj, mob/user as mob, params)
- if(default_unfasten_wrench(user, G))
+/obj/machinery/gibber/attackby(obj/item/P as obj, mob/user as mob, params)
+ if (istype(P, /obj/item/weapon/grab))
+ var/obj/item/weapon/grab/G = P
+ if(!istype(G.affecting, /mob/living/carbon/))
+ user << "This item is not suitable for the gibber!"
+ return
+ if(G.affecting.abiotic(1) && !ignore_clothing)
+ user << "Subject may not have abiotic items on."
+ return
+
+ user.visible_message("[user] starts to put [G.affecting] into the gibber!")
+ src.add_fingerprint(user)
+ if(do_after(user, gibtime) && G && G.affecting && !occupant)
+ user.visible_message("[user] stuffs [G.affecting] into the gibber!")
+ var/mob/M = G.affecting
+ if(M.client)
+ M.client.perspective = EYE_PERSPECTIVE
+ M.client.eye = src
+ M.loc = src
+ src.occupant = M
+ qdel(G)
+ update_icon()
+
+ if(default_deconstruction_screwdriver(user, "grinder_open", "grinder", P))
return
- if (!( istype(G, /obj/item/weapon/grab)) || !(istype(G.affecting, /mob/living/carbon/human)))
- user << "This item is not suitable for the gibber!"
- return
- if(G.affecting.abiotic(1))
- user << "Subject may not have abiotic items on."
+ if(exchange_parts(user, P))
return
- user.visible_message("[user] starts to put [G.affecting] into the gibber!")
- src.add_fingerprint(user)
- if(do_after(user, 30) && G && G.affecting && !occupant)
- user.visible_message("[user] stuffs [G.affecting] into the gibber!")
- var/mob/M = G.affecting
- if(M.client)
- M.client.perspective = EYE_PERSPECTIVE
- M.client.eye = src
- M.loc = src
- src.occupant = M
- qdel(G)
- update_icon()
+ if(default_pry_open(P))
+ return
+
+ if(default_unfasten_wrench(user, P))
+ return
+
+ default_deconstruction_crowbar(P)
+
/obj/machinery/gibber/verb/eject()
@@ -125,15 +156,21 @@
return
use_power(1000)
visible_message("You hear a loud squelchy grinding sound.")
+ playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1)
src.operating = 1
update_icon()
+ var/offset = prob(50) ? -2 : 2
+ animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 200) //start shaking
var/sourcename = src.occupant.real_name
- var/sourcejob = src.occupant.job
+ var/sourcejob
+ if(ishuman(occupant))
+ var/mob/living/carbon/human/gibee = occupant
+ sourcejob = gibee.job
var/sourcenutriment = src.occupant.nutrition / 15
var/sourcetotalreagents = src.occupant.reagents.total_volume
- var/totalslabs = 3
+ var/gibtype = /obj/effect/decal/cleanable/blood/gibs
- var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/allmeat[totalslabs]
+ var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/allmeat[meat_produced]
if(ishuman(occupant))
var/mob/living/carbon/human/gibee = occupant
@@ -141,13 +178,19 @@
typeofmeat = gibee.dna.species.meat
else
typeofmeat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human
- for (var/i=1 to totalslabs)
- var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/newmeat = new typeofmeat
+ else
+ if(iscarbon(occupant))
+ var/mob/living/carbon/C = occupant
+ typeofmeat = C.type_of_meat
+ gibtype = C.gib_type
+ for (var/i=1 to meat_produced)
+ var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/newmeat = new typeofmeat
newmeat.name = sourcename + newmeat.name
newmeat.subjectname = sourcename
- newmeat.subjectjob = sourcejob
- newmeat.reagents.add_reagent ("nutriment", sourcenutriment / totalslabs) // Thehehe. Fat guys go first
- src.occupant.reagents.trans_to (newmeat, round (sourcetotalreagents / totalslabs, 1)) // Transfer all the reagents from the
+ if(sourcejob)
+ newmeat.subjectjob = sourcejob
+ newmeat.reagents.add_reagent ("nutriment", sourcenutriment / meat_produced) // Thehehe. Fat guys go first
+ src.occupant.reagents.trans_to (newmeat, round (sourcetotalreagents / meat_produced, 1)) // Transfer all the reagents from the
allmeat[i] = newmeat
add_logs(user, occupant, "gibbed")
@@ -157,13 +200,17 @@
spawn(src.gibtime)
playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
operating = 0
- for (var/i=1 to totalslabs)
+ for (var/i=1 to meat_produced)
+ var/list/nearby_turfs = orange(3, get_turf(src))
var/obj/item/meatslab = allmeat[i]
- var/turf/Tx = locate(src.x - i, src.y, src.z)
meatslab.loc = src.loc
- meatslab.throw_at(Tx,i,3)
- if (!Tx.density)
- new /obj/effect/decal/cleanable/blood/gibs(Tx,i)
+ meatslab.throw_at(pick(nearby_turfs),i,3)
+ for (var/turfs=1 to meat_produced*3)
+ var/turf/gibturf = pick(nearby_turfs)
+ if (!gibturf.density && src in viewers(gibturf))
+ new gibtype(gibturf,i)
+
+ pixel_x = initial(pixel_x) //return to its spot after shaking
src.operating = 0
update_icon()
diff --git a/code/modules/food&drinks/kitchen machinery/microwave.dm b/code/modules/food&drinks/kitchen machinery/microwave.dm
index ff196ae88db..b04ac183825 100644
--- a/code/modules/food&drinks/kitchen machinery/microwave.dm
+++ b/code/modules/food&drinks/kitchen machinery/microwave.dm
@@ -12,7 +12,7 @@
var/operating = 0 // Is it on?
var/dirty = 0 // = {0..100} Does it need cleaning?
var/broken = 0 // ={0,1,2} How broken is it???
- var/global/max_n_of_items = 10
+ var/max_n_of_items = 10 // whatever fat fuck made this a global var needs to look at themselves in the mirror sometime
var/efficiency = 0
var/microwavepower = 1
@@ -28,15 +28,20 @@
component_parts = list()
component_parts += new /obj/item/weapon/circuitboard/microwave(null)
component_parts += new /obj/item/weapon/stock_parts/micro_laser(null)
+ component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/cable_coil(null, 2)
RefreshParts()
/obj/machinery/microwave/RefreshParts()
var/E
+ var/max_items = 10
for(var/obj/item/weapon/stock_parts/micro_laser/M in component_parts)
E += M.rating
+ for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
+ max_items = 10 * M.rating
efficiency = E
+ max_n_of_items = max_items
/*******************
* Item Adding
@@ -246,6 +251,7 @@
if(F.cooked_type)
var/obj/item/weapon/reagent_containers/food/snacks/S = new F.cooked_type (get_turf(src))
F.initialize_cooked_food(S, efficiency)
+ feedback_add_details("food_made","[F.name]")
else
new /obj/item/weapon/reagent_containers/food/snacks/badrecipe(src)
if(dirty < 100)
diff --git a/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm b/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm
index 7d709d9cf8f..bb88e5ec867 100644
--- a/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm
+++ b/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm
@@ -10,12 +10,44 @@
idle_power_usage = 5
active_power_usage = 50
var/grinded = 0
+ var/required_grind = 5
+ var/cube_production = 1
+/obj/machinery/monkey_recycler/New()
+ ..()
+ component_parts = list()
+ component_parts += new /obj/item/weapon/circuitboard/monkey_recycler(null)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
+ component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
+ RefreshParts()
+
+/obj/machinery/monkey_recycler/RefreshParts()
+ var/req_grind = 5
+ var/cubes_made = 1
+ for(var/obj/item/weapon/stock_parts/manipulator/B in component_parts)
+ req_grind -= B.rating
+ for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
+ cubes_made = M.rating
+ cube_production = cubes_made
+ required_grind = req_grind
+
/obj/machinery/monkey_recycler/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
- if(default_unfasten_wrench(user, O))
+ if(default_deconstruction_screwdriver(user, "grinder_open", "grinder", O))
return
+ if(exchange_parts(user, O))
+ return
+
+ if(default_pry_open(O))
+ return
+
+ if(default_unfasten_wrench(user, O))
+ power_change()
+ return
+
+ default_deconstruction_crowbar(O)
+
if (src.stat != 0) //NOPOWER etc
return
if (istype(O, /obj/item/weapon/grab))
@@ -32,8 +64,12 @@
qdel(target)
user << "You stuff the monkey in the machine."
playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1)
+ var/offset = prob(50) ? -2 : 2
+ animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 200) //start shaking
use_power(500)
src.grinded++
+ sleep(50)
+ pixel_x = initial(pixel_x) //return to its spot after shaking
user << "The machine now has [grinded] monkey\s worth of material stored."
else
@@ -43,12 +79,13 @@
/obj/machinery/monkey_recycler/attack_hand(var/mob/user as mob)
if (src.stat != 0) //NOPOWER etc
return
- if(grinded >= 5)
+ if(grinded >= required_grind)
user << "The machine hisses loudly as it condenses the grinded monkey meat. After a moment, it dispenses a brand new monkey cube."
playsound(src.loc, 'sound/machines/hiss.ogg', 50, 1)
- grinded -= 5
- new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped(src.loc)
+ grinded -= required_grind
+ for(var/i = 0, i < cube_production, i++)
+ new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped(src.loc)
user << "The machine's display flashes that it has [grinded] monkeys worth of material left."
else
- user << "The machine needs at least 5 monkeys worth of material to produce a monkey cube. It only has [grinded]."
+ user << "The machine needs at least [required_grind] monkey(s) worth of material to produce a monkey cube. It only has [grinded]."
return
diff --git a/code/modules/food&drinks/kitchen machinery/processor.dm b/code/modules/food&drinks/kitchen machinery/processor.dm
index cde0bf70683..78038266d98 100644
--- a/code/modules/food&drinks/kitchen machinery/processor.dm
+++ b/code/modules/food&drinks/kitchen machinery/processor.dm
@@ -12,16 +12,31 @@
use_power = 1
idle_power_usage = 5
active_power_usage = 50
+ var/rating_speed = 1
+ var/rating_amount = 1
+/obj/machinery/processor/New()
+ ..()
+ component_parts = list()
+ component_parts += new /obj/item/weapon/circuitboard/processor(null)
+ component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
+ RefreshParts()
+/obj/machinery/processor/RefreshParts()
+ for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)
+ rating_amount = B.rating
+ for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
+ rating_speed = M.rating
/datum/food_processor_process
var/input
var/output
var/time = 40
-/datum/food_processor_process/proc/process_food(loc, what)
- if (src.output && loc)
- new src.output(loc)
+/datum/food_processor_process/proc/process_food(loc, what, var/obj/machinery/processor/processor)
+ if (src.output && loc && processor)
+ for(var/i = 0, i < processor.rating_amount, i++)
+ new src.output(loc)
if (what)
qdel(what) // Note to self: Make this safer
@@ -60,18 +75,18 @@
/* mobs */
-/datum/food_processor_process/mob/process_food(loc, what)
+/datum/food_processor_process/mob/process_food(loc, what, processor)
..()
-/datum/food_processor_process/mob/slime/process_food(loc, what)
+/datum/food_processor_process/mob/slime/process_food(loc, what, var/obj/machinery/processor/processor)
var/mob/living/simple_animal/slime/S = what
var/C = S.cores
if(S.stat != DEAD)
S.loc = loc
S.visible_message("[C] crawls free of the processor!")
return
- for(var/i = 1, i <= C, i++)
+ for(var/i = 1, i <= C + processor.rating_amount, i++)
new S.coretype(loc)
feedback_add_details("slime_core_harvested","[replacetext(S.colour," ","_")]")
..()
@@ -79,7 +94,7 @@
/datum/food_processor_process/mob/slime/input = /mob/living/simple_animal/slime
/datum/food_processor_process/mob/slime/output = null
-/datum/food_processor_process/mob/monkey/process_food(loc, what)
+/datum/food_processor_process/mob/monkey/process_food(loc, what, processor)
var/mob/living/carbon/monkey/O = what
if (O.client) //grief-proof
O.loc = loc
@@ -123,8 +138,20 @@
if(src.processing)
user << "The processor is in the process of processing!"
return 1
+ if(default_deconstruction_screwdriver(user, "processor1", "processor", O))
+ return
+
+ if(exchange_parts(user, O))
+ return
+
+ if(default_pry_open(O))
+ return
+
if(default_unfasten_wrench(user, O))
return
+
+ default_deconstruction_crowbar(O)
+
var/what = O
if (istype(O, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = O
@@ -151,20 +178,30 @@
if(src.contents.len == 0)
user << "The processor is empty!"
return 1
+ src.processing = 1
+ user.visible_message("[user] turns on [src].", \
+ "You turn on [src].", \
+ "You hear a food processor.")
+ playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
+ use_power(500)
+ var/total_time = 0
+ for(var/O in src.contents)
+ var/datum/food_processor_process/P = select_recipe(O)
+ if (!P)
+ log_admin("DEBUG: [O] in processor havent suitable recipe. How do you put it in?") //-rastaf0 // DEAR GOD THIS BURNS MY EYES HAVE YOU EVER LOOKED IN AN ENGLISH DICTONARY BEFORE IN YOUR LIFE AAAAAAAAAAAAAAAAAAAAA - Iamgoofball
+ continue
+ total_time += P.time
+ var/offset = prob(50) ? -2 : 2
+ animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = (total_time / rating_speed)*5) //start shaking
+ sleep(total_time / rating_speed)
for(var/O in src.contents)
var/datum/food_processor_process/P = select_recipe(O)
if (!P)
log_admin("DEBUG: [O] in processor havent suitable recipe. How do you put it in?") //-rastaf0
continue
- src.processing = 1
- user.visible_message("[user] turns on \a [src].", \
- "You turn on \a [src].", \
- "You hear a food processor.")
- playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
- use_power(500)
- sleep(P.time)
- P.process_food(src.loc, O)
- src.processing = 0
+ P.process_food(src.loc, O, src)
+ pixel_x = initial(pixel_x) //return to its spot after shaking
+ src.processing = 0
src.visible_message("\the [src] finishes processing.")
/obj/machinery/processor/verb/eject()
diff --git a/code/modules/food&drinks/kitchen machinery/smartfridge.dm b/code/modules/food&drinks/kitchen machinery/smartfridge.dm
index 9746ee4a83c..dce85ce5ed2 100644
--- a/code/modules/food&drinks/kitchen machinery/smartfridge.dm
+++ b/code/modules/food&drinks/kitchen machinery/smartfridge.dm
@@ -13,11 +13,22 @@
idle_power_usage = 5
active_power_usage = 100
flags = NOREACT
- var/global/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't like things over 1000.
+ var/max_n_of_items = 1500
var/icon_on = "smartfridge"
var/icon_off = "smartfridge-off"
var/item_quants = list()
+/obj/machinery/smartfridge/New()
+ ..()
+ component_parts = list()
+ component_parts += new /obj/item/weapon/circuitboard/smartfridge(null)
+ component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
+ RefreshParts()
+
+/obj/machinery/smartfridge/RefreshParts()
+ for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)
+ max_n_of_items = 1500 * B.rating
+
/obj/machinery/smartfridge/power_change()
..()
update_icon()
@@ -35,9 +46,21 @@
********************/
/obj/machinery/smartfridge/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
+ if(default_deconstruction_screwdriver(user, "smartfridge_open", "smartfridge", O))
+ return
+
+ if(exchange_parts(user, O))
+ return
+
+ if(default_pry_open(O))
+ return
+
if(default_unfasten_wrench(user, O))
power_change()
return
+
+ default_deconstruction_crowbar(O)
+
if(stat)
return 0
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index 41d7dedaaa5..ba32bb2c6ff 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -13,6 +13,7 @@
var/menustat = "menu"
var/efficiency = 0
var/productivity = 0
+ var/max_items = 40
/obj/machinery/biogenerator/New()
..()
@@ -28,12 +29,15 @@
/obj/machinery/biogenerator/RefreshParts()
var/E = 0
var/P = 0
+ var/max_storage = 40
for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)
P += B.rating
+ max_storage = 40 * B.rating
for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
E += M.rating
efficiency = E
productivity = P
+ max_items = max_storage
/obj/machinery/biogenerator/on_reagent_change() //When the reagents change, change the icon as well.
update_icon()
@@ -65,15 +69,15 @@
var/i = 0
for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents)
i++
- if(i >= 10)
+ if(i >= max_items)
user << "The biogenerator is already full! Activate it."
else
for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in O.contents)
- if(i >= 10)
+ if(i >= max_items)
break
G.loc = src
i++
- if(i<10)
+ if(iYou empty the plant bag into the biogenerator."
else if(O.contents.len == 0)
user << "You empty the plant bag into the biogenerator, filling it to its capacity."
@@ -87,7 +91,7 @@
var/i = 0
for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents)
i++
- if(i >= 10)
+ if(i >= max_items)
user << "The biogenerator is full! Activate it."
else
user.unEquip(O)
@@ -155,6 +159,7 @@
dat += "Book bag: Make ([200/efficiency]) "
dat += "Plant bag: Make ([200/efficiency]) "
dat += "Mining satchel: Make ([200/efficiency]) "
+ dat += "Chemistry bag: Make ([200/efficiency]) "
dat += "Botanical gloves: Make ([250/efficiency]) "
dat += "Utility belt: Make ([300/efficiency]) "
dat += "Security belt: Make ([300/efficiency]) "
@@ -266,6 +271,9 @@
if("mnbag")
if (check_cost(200/efficiency)) return 0
else new/obj/item/weapon/storage/bag/ore(src.loc)
+ if("chbag")
+ if (check_cost(200/efficiency)) return 0
+ else new/obj/item/weapon/storage/bag/chemistry(src.loc)
if("gloves")
if (check_cost(250/efficiency)) return 0
else new/obj/item/clothing/gloves/botanic_leather(src.loc)
diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index df14126ae63..07ee7c17a2e 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -89,7 +89,7 @@
qdel(src)
return
else
- usr << " You must dry this first!"
+ usr << "You must dry this first!"
/obj/item/weapon/grown/log/steel
seed = /obj/item/seeds/steelmycelium
@@ -115,7 +115,7 @@
/obj/item/weapon/grown/sunflower/attack(mob/M as mob, mob/user as mob)
M << " [user] smacks you with a sunflower!FLOWER POWER"
- user << " Your sunflower's FLOWER POWER strikes [M]"
+ user << "Your sunflower's FLOWER POWERstrikes [M]"
/obj/item/weapon/grown/novaflower
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 78a92dc1481..3b3b9ab28d2 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -22,6 +22,7 @@
var/planted = 0 //Is it occupied?
var/harvest = 0 //Ready to harvest?
var/obj/item/seeds/myseed = null //The currently planted seed
+ var/rating = 1
var/unwrenchable = 1
pixel_y=8
@@ -37,22 +38,34 @@
component_parts += new /obj/item/weapon/circuitboard/hydroponics(null)
component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
RefreshParts()
/obj/machinery/hydroponics/constructable/RefreshParts()
- var tmp_capacity = 0
+ var/tmp_capacity = 0
for (var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
tmp_capacity += M.rating
+ for (var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
+ rating = M.rating
maxwater = tmp_capacity * 50 // Up to 300
maxnutri = tmp_capacity * 5 // Up to 30
waterlevel = maxwater
nutrilevel = 3
/obj/machinery/hydroponics/constructable/attackby(obj/item/I, mob/user, params)
+ if(default_deconstruction_screwdriver(user, "hydrotray3", "hydrotray3", I))
+ return
+
if(exchange_parts(user, I))
return
+ if(default_pry_open(I))
+ return
+
+ if(default_unfasten_wrench(user, I))
+ return
+
if(istype(I, /obj/item/weapon/crowbar))
if(anchored==2)
user << "Unscrew the hoses first!"
@@ -89,10 +102,10 @@
mutate()
else if(istype(Proj ,/obj/item/projectile/energy/florayield))
if(myseed.yield == 0)//Oh god don't divide by zero you'll doom us all.
- adjustSYield(1)
+ adjustSYield(1 * rating)
//world << "Yield increased by 1, from 0, to a total of [myseed.yield]"
else if(prob(1/(myseed.yield * myseed.yield) * 100))//This formula gives you diminishing returns based on yield. 100% with 1 yield, decreasing to 25%, 11%, 6, 4, 2...
- adjustSYield(1)
+ adjustSYield(1 * rating)
//world << "Yield increased by 1, to a total of [myseed.yield]"
else
..()
@@ -115,7 +128,7 @@
//Nutrients//////////////////////////////////////////////////////////////
// Nutrients deplete slowly
if(prob(50))
- adjustNutri(-1)
+ adjustNutri(-1 / rating)
// Lack of nutrients hurts non-weeds
if(nutrilevel <= 0 && myseed.plant_type != 1)
@@ -128,56 +141,56 @@
var/lightAmt = currentTurf.lighting_lumcount
if(myseed.plant_type == 2) // Mushroom
if(lightAmt < 2)
- adjustHealth(-1)
+ adjustHealth(-1 / rating)
else // Non-mushroom
if(lightAmt < 4)
- adjustHealth(-2)
+ adjustHealth(-2 / rating)
//Water//////////////////////////////////////////////////////////////////
// Drink random amount of water
- adjustWater(-rand(1,6))
+ adjustWater(-rand(1,6) / rating)
// If the plant is dry, it loses health pretty fast, unless mushroom
if(waterlevel <= 10 && myseed.plant_type != 2)
- adjustHealth(-rand(0,1))
+ adjustHealth(-rand(0,1) / rating)
if(waterlevel <= 0)
- adjustHealth(-rand(0,2))
+ adjustHealth(-rand(0,2) / rating)
// Sufficient water level and nutrient level = plant healthy
else if(waterlevel > 10 && nutrilevel > 0)
- adjustHealth(rand(1,2))
+ adjustHealth(rand(1,2) / rating)
if(prob(5)) //5 percent chance the weed population will increase
- adjustWeeds(1)
+ adjustWeeds(1 / rating)
//Toxins/////////////////////////////////////////////////////////////////
// Too much toxins cause harm, but when the plant drinks the contaiminated water, the toxins disappear slowly
if(toxic >= 40 && toxic < 80)
- adjustHealth(-1)
- adjustToxic(-rand(1,10))
+ adjustHealth(-1 / rating)
+ adjustToxic(-rand(1,10) / rating)
else if(toxic >= 80) // I don't think it ever gets here tbh unless above is commented out
adjustHealth(-3)
- adjustToxic(-rand(1,10))
+ adjustToxic(-rand(1,10) / rating)
//Pests & Weeds//////////////////////////////////////////////////////////
else if(pestlevel >= 5)
- adjustHealth(-1)
+ adjustHealth(-1 / rating)
// If it's a weed, it doesn't stunt the growth
if(weedlevel >= 5 && myseed.plant_type != 1 )
- adjustHealth(-1)
+ adjustHealth(-1 / rating)
//Health & Age///////////////////////////////////////////////////////////
// Plant dies if health <= 0
if(health <= 0)
plantdies()
- adjustWeeds(1) // Weeds flourish
+ adjustWeeds(1 / rating) // Weeds flourish
// If the plant is too old, lose health fast
if(age > myseed.lifespan)
- adjustHealth(-rand(1,5))
+ adjustHealth(-rand(1,5) / rating)
// Harvest code
if(age > myseed.production && (age - lastproduce) > myseed.production && (!harvest && !dead))
@@ -187,10 +200,10 @@
else
lastproduce = age
if(prob(5)) // On each tick, there's a 5 percent chance the pest population will increase
- adjustPests(1)
+ adjustPests(1 / rating)
else
if(waterlevel > 10 && nutrilevel > 0 && prob(10)) // If there's no plant, the percentage chance is 10%
- adjustWeeds(1)
+ adjustWeeds(1 / rating)
// Weeeeeeeeeeeeeeedddssss
@@ -436,18 +449,18 @@
// Nutriments
if(S.has_reagent("eznutriment", 1))
- yieldmod = 1
- mutmod = 1
+ yieldmod = 1 * rating
+ mutmod = 1 * rating
adjustNutri(round(S.get_reagent_amount("eznutriment") * 1))
if(S.has_reagent("left4zednutriment", 1))
- yieldmod = 0
- mutmod = 2
+ yieldmod = 0 * rating
+ mutmod = 2 * rating
adjustNutri(round(S.get_reagent_amount("left4zednutriment") * 1))
if(S.has_reagent("robustharvestnutriment", 1))
- yieldmod = 2
- mutmod = 0
+ yieldmod = 2 * rating
+ mutmod = 0 * rating
adjustNutri(round(S.get_reagent_amount("robustharvestnutriment") *1 ))
// Antitoxin binds shit pretty well. So the tox goes significantly down
@@ -671,25 +684,25 @@
else if(istype(O, /obj/item/device/analyzer/plant_analyzer))
if(planted && myseed)
user << "*** [myseed.plantname] ***" //Carn: now reports the plants growing, not the seeds.
- user << "-Plant Age: [age]"
- user << "-Plant Endurance: [myseed.endurance]"
- user << "-Plant Lifespan: [myseed.lifespan]"
+ user << "-Plant Age: [age]"
+ user << "-Plant Endurance: [myseed.endurance]"
+ user << "-Plant Lifespan: [myseed.lifespan]"
if(myseed.yield != -1)
- user << "-Plant Yield: [myseed.yield]"
- user << "-Plant Production: [myseed.production]"
+ user << "-Plant Yield: [myseed.yield]"
+ user << "-Plant Production: [myseed.production]"
if(myseed.potency != -1)
- user << "-Plant Potency: [myseed.potency]"
+ user << "-Plant Potency: [myseed.potency]"
var/list/text_strings = myseed.get_analyzer_text()
if(text_strings)
for(var/string in text_strings)
user << string
else
user << "No plant found."
- user << "-Weed level: [weedlevel] / 10"
- user << "-Pest level: [pestlevel] / 10"
- user << "-Toxicity level: [toxic] / 100"
- user << "-Water level: [waterlevel] / [maxwater]"
- user << "-Nutrition level: [nutrilevel] / [maxnutri]"
+ user << "-Weed level: [weedlevel] / 10"
+ user << "-Pest level: [pestlevel] / 10"
+ user << "-Toxicity level: [toxic] / 100"
+ user << "-Water level: [waterlevel] / [maxwater]"
+ user << "-Nutrition level: [nutrilevel] / [maxnutri]"
user << ""
else if(istype(O, /obj/item/weapon/cultivator))
@@ -734,17 +747,17 @@
user.visible_message("[user] unwrenches [src].", \
"You unwrench [src].")
- else if(istype(O, /obj/item/weapon/screwdriver) && unwrenchable) //THIS NEED TO BE DONE DIFFERENTLY, SOMEONE REFACTOR THE TRAY CODE ALREADY
+ else if(istype(O, /obj/item/weapon/wirecutters) && unwrenchable) //THIS NEED TO BE DONE DIFFERENTLY, SOMEONE REFACTOR THE TRAY CODE ALREADY
if(anchored)
if(anchored == 2)
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+ playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
anchored = 1
- user << "You unscrew \the [src]'s hoses."
+ user << "You snip \the [src]'s hoses."
else if(anchored == 1)
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+ playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
anchored = 2
- user << "You screw in \the [src]'s hoses."
+ user << "You reconnect \the [src]'s hoses."
for(var/obj/machinery/hydroponics/h in range(1,src))
spawn()
@@ -789,7 +802,7 @@
var/t_amount = 0
var/list/result = list()
var/output_loc = parent.Adjacent(user) ? user.loc : parent.loc //needed for TK
-
+ var/product_name
while(t_amount < getYield())
var/obj/item/weapon/reagent_containers/food/snacks/grown/t_prod = new product(output_loc, potency)
result.Add(t_prod) // User gets a consumable
@@ -802,7 +815,9 @@
t_prod.potency = potency
t_prod.plant_type = plant_type
t_amount++
-
+ product_name = t_prod.name
+ if(getYield() >= 1)
+ feedback_add_details("food_harvested","[product_name]|[getYield()]")
parent.update_tray()
return result
@@ -848,9 +863,9 @@
podman.ckey = ckey_holder
podman.gender = blood_gender
podman.faction |= factions
- if(!mutant_color)
- mutant_color = "#59CE00"
- hardset_dna(podman,null,null,podman.real_name,blood_type,/datum/species/plant/pod,mutant_color)//Discard SE's and UI's, podman cloning is inaccurate, and always make them a podman
+ if(!features["mcolor"])
+ features["mcolor"] = "#59CE00"
+ hardset_dna(podman,null,null,podman.real_name,blood_type,/datum/species/plant/pod,features)//Discard SE's and UI's, podman cloning is inaccurate, and always make them a podman
podman.set_cloned_appearance()
else //else, one packet of seeds. maybe two
diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm
index c7169acc0c3..0ad83aeb190 100644
--- a/code/modules/hydroponics/seed_extractor.dm
+++ b/code/modules/hydroponics/seed_extractor.dm
@@ -1,7 +1,10 @@
-/proc/seedify(var/obj/item/O as obj, var/t_max)
+/proc/seedify(var/obj/item/O as obj, var/t_max, var/obj/machinery/seed_extractor/extractor)
var/t_amount = 0
if(t_max == -1)
- t_max = rand(1,4)
+ if(extractor)
+ t_max = rand(1,4) * extractor.seed_multiplier
+ else
+ t_max = rand(1,4)
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/))
var/obj/item/weapon/reagent_containers/food/snacks/grown/F = O
@@ -51,8 +54,39 @@
density = 1
anchored = 1
var/piles = list()
+ var/max_seeds = 1000
+ var/seed_multiplier = 1
+
+/obj/machinery/seed_extractor/New()
+ ..()
+ component_parts = list()
+ component_parts += new /obj/item/weapon/circuitboard/seed_extractor(null)
+ component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
+ RefreshParts()
+
+/obj/machinery/seed_extractor/RefreshParts()
+ for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)
+ max_seeds = 1000 * B.rating
+ for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
+ seed_multiplier = M.rating
/obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
+
+ if(default_deconstruction_screwdriver(user, "sextractor_open", "sextractor", O))
+ return
+
+ if(exchange_parts(user, O))
+ return
+
+ if(default_pry_open(O))
+ return
+
+ if(default_unfasten_wrench(user, O))
+ return
+
+ default_deconstruction_crowbar(O)
+
if(isrobot(user))
return
@@ -60,7 +94,7 @@
var/obj/item/weapon/storage/P = O
var/loaded = 0
for(var/obj/item/seeds/G in P.contents)
- if(contents.len >= 999)
+ if(contents.len >= max_seeds)
break
++loaded
add(G)
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index 05369322619..065d3d8d08f 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -36,14 +36,14 @@
/obj/item/seeds/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
user << "*** [plantname] ***"
- user << "-Plant Endurance: [endurance]"
- user << "-Plant Lifespan: [lifespan]"
- user << "-Species Discovery Value: [rarity]"
+ user << "-Plant Endurance: [endurance]"
+ user << "-Plant Lifespan: [lifespan]"
+ user << "-Species Discovery Value: [rarity]"
if(yield != -1)
- user << "-Plant Yield: [yield]"
- user << "-Plant Production: [production]"
+ user << "-Plant Yield: [yield]"
+ user << "-Plant Production: [production]"
if(potency != -1)
- user << "-Plant Potency: [potency]"
+ user << "-Plant Potency: [potency]"
var/list/text_strings = get_analyzer_text()
if(text_strings)
for(var/string in text_strings)
@@ -90,7 +90,7 @@
var/datum/mind/mind = null
var/blood_gender = null
var/blood_type = null
- var/mutant_color = null
+ var/list/features = null
var/factions = null
var/contains_sample = 0
@@ -104,7 +104,7 @@
realName = bloodSample.data["real_name"]
blood_gender = bloodSample.data["gender"]
blood_type = bloodSample.data["blood_type"]
- mutant_color = bloodSample.data["mutant_color"]
+ features = bloodSample.data["features"]
factions = bloodSample.data["factions"]
W.reagents.clear_reagents()
user << "You inject the contents of the syringe into the seeds."
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index 254b383c7a4..c9d885d8f29 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -16,8 +16,9 @@
*/
/obj/machinery/computer/libraryconsole
name = "library visitor console"
- icon = 'icons/obj/computer.dmi'
- icon_state = "library"
+ icon_state = "oldcomp"
+ icon_screen = "library"
+ icon_keyboard = null
circuit = /obj/item/weapon/circuitboard/libraryconsole
var/screenstate = 0
var/title
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 1b81cbe8e9c..1dd002229be 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -16,6 +16,9 @@
var/stack_list[0] //Key: Type. Value: Instance of type.
var/obj/item/weapon/card/id/inserted_id
var/points = 0
+ var/ore_pickup_rate = 15
+ var/sheet_per_ore = 1
+ var/point_upgrade = 1
var/list/ore_values = list(("sand" = 1), ("iron" = 1), ("gold" = 20), ("silver" = 20), ("uranium" = 20), ("bananium" = 30), ("diamond" = 40), ("plasma" = 40))
/obj/machinery/mineral/ore_redemption/New()
@@ -23,10 +26,26 @@
component_parts = list()
component_parts += new /obj/item/weapon/circuitboard/ore_redemption(null)
component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
+ component_parts += new /obj/item/weapon/stock_parts/micro_laser(null)
component_parts += new /obj/item/device/assembly/igniter(null)
component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
RefreshParts()
+/obj/machinery/mineral/ore_redemption/RefreshParts()
+ var/ore_pickup_rate_temp = 15
+ var/point_upgrade_temp = 1
+ var/sheet_per_ore_temp = 1
+ for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)
+ sheet_per_ore_temp = B.rating
+ for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
+ ore_pickup_rate_temp = 15 * M.rating
+ for(var/obj/item/weapon/stock_parts/micro_laser/L in component_parts)
+ point_upgrade_temp = L.rating
+ ore_pickup_rate = ore_pickup_rate_temp
+ point_upgrade = point_upgrade_temp
+ sheet_per_ore = sheet_per_ore_temp
+
/obj/machinery/mineral/ore_redemption/proc/process_sheet(obj/item/weapon/ore/O)
var/obj/item/stack/sheet/processed_sheet = SmeltMineral(O)
if(processed_sheet)
@@ -40,7 +59,7 @@
if(D.department == "Science" || D.department == "Robotics" || D.department == "Research Director's Desk" || (D.department == "Chemistry" && (s.name == "uranium" || s.name == "solid plasma")))
D.createmessage("Ore Redemption Machine", "New minerals available!", msg, 1, 0)
var/obj/item/stack/sheet/storage = stack_list[processed_sheet]
- storage.amount += 1 //Stack the sheets
+ storage.amount += sheet_per_ore //Stack the sheets
O.loc = null //Let the old sheet...
qdel(O) //... garbage collect
@@ -50,7 +69,7 @@
var/i
if(T)
if(locate(/obj/item/weapon/ore) in T)
- for (i = 0; i < 10; i++)
+ for (i = 0; i < ore_pickup_rate; i++)
var/obj/item/weapon/ore/O = locate() in T
if(O)
process_sheet(O)
@@ -59,7 +78,7 @@
else
var/obj/structure/ore_box/B = locate() in T
if(B)
- for (i = 0; i < 10; i++)
+ for (i = 0; i < ore_pickup_rate; i++)
var/obj/item/weapon/ore/O = locate() in B.contents
if(O)
process_sheet(O)
@@ -75,6 +94,14 @@
inserted_id = I
interact(user)
return
+ if(exchange_parts(user, W))
+ return
+
+ if(default_pry_open(W))
+ return
+
+ if(default_unfasten_wrench(user, W))
+ return
if(default_deconstruction_screwdriver(user, "ore_redemption-open", "ore_redemption", W))
updateUsrDialog()
return
@@ -88,7 +115,7 @@
/obj/machinery/mineral/ore_redemption/proc/SmeltMineral(var/obj/item/weapon/ore/O)
if(O.refined_type)
var/obj/item/stack/sheet/M = O.refined_type
- points += O.points
+ points += O.points * point_upgrade
return M
qdel(O)//No refined type? Purge it.
return
@@ -135,7 +162,7 @@
var/dat = "
"
for(var/ore in ore_values)
var/value = ore_values[ore]
- dat += "
[capitalize(ore)]
[value]
"
+ dat += "
[capitalize(ore)]
[value * point_upgrade]
"
dat += "
"
return dat
diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm
index 7f0992a502f..079eaeab8dd 100644
--- a/code/modules/mining/laborcamp/laborshuttle.dm
+++ b/code/modules/mining/laborcamp/laborshuttle.dm
@@ -1,8 +1,6 @@
/obj/machinery/computer/shuttle/labor
name = "labor shuttle console"
desc = "Used to call and send the labor camp shuttle."
- icon = 'icons/obj/computer.dmi'
- icon_state = "shuttle"
circuit = /obj/item/weapon/circuitboard/labor_shuttle
shuttleId = "laborcamp"
possible_destinations = "laborcamp_home;laborcamp_away"
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index e9067b526dc..ddfdd96ad9a 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -439,6 +439,7 @@ var/global/list/rockTurfEdgeCache
user << "You finish cutting into the rock."
P.update_icon()
gets_drilled(user)
+ feedback_add_details("pick_used_mining","[P.name]")
else
return attack_hand(user)
return
@@ -448,6 +449,7 @@ var/global/list/rockTurfEdgeCache
var/i
for (i=0;i 0))
stat(null, "Time left: [max(malf.AI_win_timeleft/malf.apcs, 0)]")
+ if(istype(ticker.mode, /datum/game_mode/gang))
+ var/datum/game_mode/gang/mode = ticker.mode
+ if(isnum(mode.A_timer))
+ stat(null, "[gang_name("A")] Gang Takeover: [max(mode.A_timer, 0)]")
+ if(isnum(mode.B_timer))
+ stat(null, "[gang_name("B")] Gang Takeover: [max(mode.B_timer, 0)]")
+
/mob/dead/observer/verb/reenter_corpse()
set category = "Ghost"
set name = "Re-enter Corpse"
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 0b33449b5ef..02d7cc2a8e2 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -12,6 +12,7 @@
ventcrawler = 2
languages = ALIEN
verb_say = "hisses"
+ type_of_meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno
var/nightvision = 1
var/storedPlasma = 250
var/max_plasma = 500
@@ -28,6 +29,7 @@
var/heat_protection = 0.5
var/leaping = 0
var/list/obj/effect/proc_holder/alien/abilities = list()
+ gib_type = /obj/effect/decal/cleanable/xenoblood/xgibs
/mob/living/carbon/alien/New()
verbs += /mob/living/proc/mob_sleep
diff --git a/code/modules/mob/living/carbon/alien/larva/emote.dm b/code/modules/mob/living/carbon/alien/larva/emote.dm
index 57c3783ed82..cf4f18c5d07 100644
--- a/code/modules/mob/living/carbon/alien/larva/emote.dm
+++ b/code/modules/mob/living/carbon/alien/larva/emote.dm
@@ -100,7 +100,7 @@
src << "Help for larva emotes. You can use these emotes with say \"*emote\":\n\nburp, choke, collapse, dance, drool, gasp, gnarl, hiss, jump, moan, nod, roll, scratch,\nscretch, shake, shiver, sign-#, sulk, sway, tail, twitch, whimper"
else
- src << " Unusable emote '[act]'. Say *help for a list."
+ src << "Unusable emote '[act]'. Say *help for a list."
if ((message && src.stat == 0))
log_emote("[name]/[key] : [message]")
diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm
index 469e4023946..093c727edc5 100644
--- a/code/modules/mob/living/carbon/alien/larva/powers.dm
+++ b/code/modules/mob/living/carbon/alien/larva/powers.dm
@@ -40,9 +40,9 @@
if(L.amount_grown >= L.max_grown) //TODO ~Carn
L << "You are growing into a beautiful alien! It is time to choose a caste."
L << "There are three to choose from:"
- L << "Hunters are strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Hunters generate plasma slowly and have low reserves."
- L << "Sentinels are tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the hunters."
- L << "Drones are the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded alien queen."
+ L << "Huntersare strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Hunters generate plasma slowly and have low reserves."
+ L << "Sentinelsare tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the hunters."
+ L << "Dronesare the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded alien queen."
var/alien_caste = alert(L, "Please choose which alien caste you shall belong to.",,"Hunter","Sentinel","Drone")
var/mob/living/carbon/alien/humanoid/new_xeno
diff --git a/code/modules/mob/living/carbon/alien/screen.dm b/code/modules/mob/living/carbon/alien/screen.dm
index 731fc39b4f1..43a98198a02 100644
--- a/code/modules/mob/living/carbon/alien/screen.dm
+++ b/code/modules/mob/living/carbon/alien/screen.dm
@@ -4,7 +4,7 @@
/mob/living/carbon/alien/proc/updatePlasmaDisplay()
if(hud_used) //clientless aliens
- hud_used.alien_plasma_display.maptext = "
[round(storedPlasma)]
"
+ hud_used.alien_plasma_display.maptext = "
[round(storedPlasma)]
"
/mob/living/carbon/alien/larva/updatePlasmaDisplay()
return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index bae07c42c8d..934a6f57e2e 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -251,7 +251,7 @@
if(istype(item, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = item
- item = G.throw() //throw the person instead of the grab
+ item = G.get_mob_if_throwable() //throw the person instead of the grab
qdel(G) //We delete the grab, as it needs to stay around until it's returned.
if(ismob(item))
var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors
@@ -306,7 +306,7 @@
Left Hand: [(l_hand && !(l_hand.flags&ABSTRACT)) ? l_hand : "Nothing"] Right Hand: [(r_hand && !(r_hand.flags&ABSTRACT)) ? r_hand : "Nothing"]"}
- dat += " Back: [back ? back : "Nothing"]"
+ dat += " Back:[back ? back : "Nothing"]"
if(istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/weapon/tank))
dat += " [internal ? "Disable Internals" : "Set Internals"]"
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 41a04d1273f..50a9c2c47fe 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -9,6 +9,9 @@
var/obj/item/handcuffed = null //Whether or not the mob is handcuffed
var/obj/item/legcuffed = null //Same as handcuffs but for legs. Bear traps use this.
+ var/list/features = list("mcolor" = "FFF", "tail" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None")
+
+
//inventory slots
var/obj/item/back = null
var/obj/item/clothing/mask/wear_mask = null
@@ -23,5 +26,7 @@
var/co2overloadtime = null
var/temperature_resistance = T0C+75
has_limbs = 1
+ var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/type_of_meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/
var/remote_view = 0
+ var/gib_type = /obj/effect/decal/cleanable/blood/gibs
diff --git a/code/modules/mob/living/carbon/human/blood.dm b/code/modules/mob/living/carbon/human/blood.dm
index e8b46b5ca51..289fb8e5ee8 100644
--- a/code/modules/mob/living/carbon/human/blood.dm
+++ b/code/modules/mob/living/carbon/human/blood.dm
@@ -30,7 +30,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
/mob/living/carbon/human/proc/fixblood()
for(var/datum/reagent/blood/B in vessel.reagent_list)
if(B.id == "blood")
- B.data = list("donor"=src,"viruses"=null,"blood_DNA"=dna.unique_enzymes,"blood_type"=dna.blood_type,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"mutant_color"=null, "factions"=null)
+ B.data = list("donor"=src,"viruses"=null,"blood_DNA"=dna.unique_enzymes,"blood_type"=dna.blood_type,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"features"=null, "factions"=null)
/mob/living/carbon/human/proc/suppress_bloodloss(var/amount)
if(bleedsuppress)
@@ -172,7 +172,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
B.data["blood_type"] = copytext(src.dna.blood_type,1,0)
B.data["gender"] = src.gender
B.data["real_name"] = src.real_name
- B.data["mutant_color"] = src.dna.mutant_color
+ B.data["features"] = src.dna.features
B.data["factions"] = src.faction
return B
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 1fda3b351f4..9a718fb01bc 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -355,7 +355,9 @@
return
if("tail" in dna.species.mutant_bodyparts)
dna.species.mutant_bodyparts -= "tail"
+ dna.species.mutant_bodyparts -= "spines"
dna.species.mutant_bodyparts |= "waggingtail"
+ dna.species.mutant_bodyparts |= "waggingspines"
update_body()
@@ -364,5 +366,8 @@
return
if("waggingtail" in dna.species.mutant_bodyparts)
dna.species.mutant_bodyparts -= "waggingtail"
+ dna.species.mutant_bodyparts -= "waggingspines"
dna.species.mutant_bodyparts |= "tail"
+ dna.species.mutant_bodyparts |= "spines"
+
update_body()
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index b51e729b8d0..696c9a3b5a4 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -272,7 +272,7 @@
if(perpname)
var/datum/data/record/R = find_record("name", perpname, data_core.general)
if(R)
- msg += "Rank: [R.fields["rank"]] "
+ msg += "Rank: [R.fields["rank"]] "
msg += "\[Front photo\] "
msg += "\[Side photo\] "
if(istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(CIH,/obj/item/cybernetic_implant/eyes/hud/medical))
@@ -300,8 +300,8 @@
if(R)
criminal = R.fields["criminal"]
- msg += "Criminal status:\[[criminal]\]\n"
- msg += "Security record:\[View\] "
+ msg += "Criminal status:\[[criminal]\]\n"
+ msg += "Security record:\[View\] "
msg += "\[Add crime\] "
msg += "\[View comment log\] "
msg += "\[Add comment\]\n"
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 620d251ed54..16be6a0f49e 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -166,7 +166,7 @@
/mob/living/carbon/human/blob_act()
if(stat == DEAD) return
- show_message(" The blob attacks you!")
+ show_message("The blob attacks you!")
var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg")
var/obj/item/organ/limb/affecting = get_organ(ran_zone(dam_zone))
apply_damage(5, BRUTE, affecting, run_armor_check(affecting, "melee"))
@@ -291,6 +291,8 @@
usr.put_in_hands(I)
usr.emote("scream")
usr.visible_message("[usr] successfully rips [I] out of their [L.getDisplayName()]!","You successfully remove [I] from your [L.getDisplayName()].")
+ if(!has_embedded_objects())
+ clear_alert("embeddedobject")
return
if(href_list["item"])
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index ab85a8f3d19..32086909dbf 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -130,6 +130,8 @@ emp_act
var/obj/item/organ/limb/affecting = get_organ(ran_zone(user.zone_sel.selecting))
var/hit_area = parse_zone(affecting.name)
var/target_area = parse_zone(target_limb.name)
+ feedback_add_details("item_used_for_combat","[I.name]|[I.force]")
+ feedback_add_details("zone_targeted","[def_zone]")
if(dna) // allows your species to affect the attacked_by code
return dna.species.spec_attacked_by(I,user,def_zone,affecting,hit_area,src.a_intent,target_limb,target_area,src)
@@ -154,7 +156,6 @@ emp_act
var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords)
apply_damage(I.force, I.damtype, affecting, armor , I)
-
var/bloody = 0
if(((I.damtype == BRUTE) && I.force && prob(25 + (I.force * 2))))
if(affecting.status == ORGAN_ORGANIC)
diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index ecc7c49649e..8d08b29ecb2 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -136,3 +136,13 @@
return bypass // if it returns 0, it will run the usual on_mob_life for that reagent. otherwise, it will stop after running handle_chemicals for the species.
else
return 0
+
+/mob/living/carbon/human/can_track(mob/living/user)
+ if(wear_id && istype(wear_id.GetID(), /obj/item/weapon/card/id/syndicate))
+ return 0
+ if(istype(head, /obj/item/clothing/head))
+ var/obj/item/clothing/head/hat = head
+ if(hat.blockTracking)
+ return 0
+
+ return ..()
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index f55238a821b..b9321879663 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -31,7 +31,7 @@
/mob/living/carbon/human/experience_pressure_difference()
playsound(src, 'sound/effects/space_wind.ogg', 50, 1)
- if(shoes.flags&NOSLIP)
+ if(shoes && shoes.flags&NOSLIP)
return 0
. = ..()
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 4f953dff6e9..c99b39e3995 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -73,12 +73,14 @@
if (getBrainLoss() >= 60 && stat != DEAD)
if (prob(3))
- switch(pick(1,2,3))
+ switch(pick(1,2,3,4))
if(1)
- say(pick("IM A PONY NEEEEEEIIIIIIIIIGH", "without oxigen blob don't evoluate?", "CAPTAINS A COMDOM", "[pick("", "that faggot traitor")] [pick("joerge", "george", "gorge", "gdoruge")] [pick("mellens", "melons", "mwrlins")] is grifing me HAL;P!!!", "can u give me [pick("telikesis","halk","eppilapse")]?", "THe saiyans screwed", "Bi is THE BEST OF BOTH WORLDS>", "I WANNA PET TEH monkeyS", "stop grifing me!!!!", "SOTP IT#"))
+ say(pick("IM A PONY NEEEEEEIIIIIIIIIGH", "without oxigen blob don't evoluate?", "CAPTAINS A COMDOM", "[pick("", "that faggot traitor")] [pick("joerge", "george", "gorge", "gdoruge")] [pick("mellens", "melons", "mwrlins")] is grifing me HAL;P!!!", "can u give me [pick("telikesis","halk","eppilapse","kamelien","eksrey","glowey skin")]?", "THe saiyans screwed", "Bi is THE BEST OF BOTH WORLDS>", "I WANNA PET TEH monkeyS", "stop grifing me!!!!", "SOTP IT#", "shiggey diggey!!", "A PIRATE APPEAR"))
if(2)
- say(pick("FUS RO DAH","fucking 4rries!", "stat me", ">my face", "roll it easy!", "waaaaaagh!!!", "red wonz go fasta", "FOR TEH EMPRAH", "lol2cat", "dem dwarfs man, dem dwarfs", "SPESS MAHREENS", "hwee did eet fhor khayosss", "lifelike texture ;_;", "luv can bloooom", "PACKETS!!!"))
+ say(pick("FUS RO DAH","fucking 4rries!", "stat me", ">my face", "roll it easy!", "waaaaaagh!!!", "red wonz go fasta", "FOR TEH EMPRAH", "lol2cat", "dem dwarfs man, dem dwarfs", "SPESS MAHREENS", "hwee did eet fhor khayosss", "lifelike texture ;_;", "luv can bloooom", "PACKETS!!!", "port ba[pick("y", "i", "e")] med!!!!", "REVIRT GON CHEM!!!!!!!!", "youed call her a toeugh bithc", "closd for merbegging", "pray can u [pick("spawn", "MAke me", "creat")] [pick("zenomorfs", "ayleins", "treaitors", "sheadow linkgs", "ubdoocters")]???"))
if(3)
+ say(pick("GEY AWAY FROM ME U GREIFING PRICK!!!!", "ur a fuckeing autist!", ";HELP SHITECIRTY MURDERIN MEE!!!", "hwat dose tha [pick("g", "squid", "r")] mean?????", "CAL; TEH SHUTTLE!!!!!", "wearnig siNGUARLTY IS .... FIne xDDDDDDDDD", "AI laW 22 Open door", "this SI mY stATIon......", "who the HELL do u thenk u r?!!!!", "geT THE FUCK OUTTTT", "H U G B O X", ";;CRAGING THIS STTAYTION WITH NIO SURVIVROS", "[pick("bager", "syebl")] is down11!!!!!!!!!!!!!!!!!", "PSHOOOM"))
+ if(4)
emote("drool")
@@ -306,7 +308,7 @@
if(mind.changeling)
mind.changeling.regenerate()
hud_used.lingchemdisplay.invisibility = 0
- hud_used.lingchemdisplay.maptext = "
"
if(!pda.toff)
for (var/obj/item/device/pda/P in sortNames(get_viewable_pdas()))
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index 46be3e6feb3..7ce41a2de6a 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -12,7 +12,6 @@
use_power()
/mob/living/silicon/robot/proc/clamp_values()
-
SetStunned(min(stunned, 30))
SetParalysis(min(paralysis, 30))
SetWeakened(min(weakened, 20))
@@ -23,29 +22,16 @@
adjustFireLoss(0)
/mob/living/silicon/robot/proc/use_power()
-
- if(cell)
- if(cell.charge <= 0)
+ if(cell && cell.charge)
+ if(cell.charge <= 100)
uneq_all()
- stat = UNCONSCIOUS
- else if (cell.charge <= 100)
- uneq_all()
- cell.use(1)
- else
- if(module_state_1)
- cell.use(5)
- if(module_state_2)
- cell.use(5)
- if(module_state_3)
- cell.use(5)
- cell.use(1)
+ cell.use(1)
else
uneq_all()
stat = UNCONSCIOUS
/mob/living/silicon/robot/handle_regular_status_updates()
-
if(camera && !scrambledcodes)
if(stat == DEAD || wires.IsCameraCut())
camera.status = 0
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 77e0040131f..a35b0988bca 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -556,13 +556,8 @@
if(user != src)//To prevent syndieborgs from emagging themselves
if(!opened)//Cover is closed
if(locked)
- if(prob(90))
- user << "You emag the cover lock."
- locked = 0
- else
- user << "You fail to emag the cover lock!"
- if(prob(25))
- src << "Hack attempt detected."
+ user << "You emag the cover lock."
+ locked = 0
else
user << "The cover is already unlocked!"
return
@@ -573,42 +568,38 @@
return
else
sleep(6)
- if(prob(50))
- SetEmagged(1)
- SetLockdown(1) //Borgs were getting into trouble because they would attack the emagger before the new laws were shown
- lawupdate = 0
- connected_ai = null
- user << "You emag [src]'s interface."
- message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)]. Laws overridden.")
- log_game("[key_name(user)] emagged cyborg [key_name(src)]. Laws overridden.")
- clear_supplied_laws()
- clear_inherent_laws()
- laws = new /datum/ai_laws/syndicate_override
- var/time = time2text(world.realtime,"hh:mm:ss")
- lawchanges.Add("[time] : [user.name]([user.key]) emagged [name]([key])")
- set_zeroth_law("Only [user.real_name] and people they designate as being such are Syndicate Agents.")
- src << "ALERT: Foreign software detected."
- sleep(5)
- src << "Initiating diagnostics..."
- sleep(20)
- src << "SynBorg v1.7 loaded."
- sleep(5)
- src << "LAW SYNCHRONISATION ERROR"
- sleep(5)
- src << "Would you like to send a report to NanoTraSoft? Y/N"
- sleep(10)
- src << "> N"
- sleep(20)
- src << "ERRORERRORERROR"
- src << "Obey these laws:"
- laws.show_laws(src)
- src << "ALERT: [user.real_name] is your new master. Obey your new laws and their commands."
- SetLockdown(0)
- update_icons()
- else
- user << "You fail to [ locked ? "unlock" : "lock"] [src]'s interface!"
- if(prob(25))
- src << "ALERT: Hack attempt detected."
+ SetEmagged(1)
+ SetLockdown(1) //Borgs were getting into trouble because they would attack the emagger before the new laws were shown
+ lawupdate = 0
+ connected_ai = null
+ user << "You emag [src]'s interface."
+ message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)]. Laws overridden.")
+ log_game("[key_name(user)] emagged cyborg [key_name(src)]. Laws overridden.")
+ clear_supplied_laws()
+ clear_inherent_laws()
+ clear_zeroth_law(0)
+ laws = new /datum/ai_laws/syndicate_override
+ var/time = time2text(world.realtime,"hh:mm:ss")
+ lawchanges.Add("[time] : [user.name]([user.key]) emagged [name]([key])")
+ set_zeroth_law("Only [user.real_name] and people they designate as being such are Syndicate Agents.")
+ src << "ALERT: Foreign software detected."
+ sleep(5)
+ src << "Initiating diagnostics..."
+ sleep(20)
+ src << "SynBorg v1.7 loaded."
+ sleep(5)
+ src << "LAW SYNCHRONISATION ERROR"
+ sleep(5)
+ src << "Would you like to send a report to NanoTraSoft? Y/N"
+ sleep(10)
+ src << "> N"
+ sleep(20)
+ src << "ERRORERRORERROR"
+ src << "Obey these laws:"
+ laws.show_laws(src)
+ src << "ALERT: [user.real_name] is your new master. Obey your new laws and their commands."
+ SetLockdown(0)
+ update_icons()
/mob/living/silicon/robot/verb/unlock_own_cover()
set category = "Robot Commands"
@@ -949,6 +940,10 @@
// They stay locked down if their wire is cut.
if(wires.LockedCut())
state = 1
+ if(state)
+ throw_alert("locked")
+ else
+ clear_alert("locked")
lockcharge = state
update_canmove()
@@ -963,6 +958,10 @@
if(hud_used)
hud_used.update_robot_modules_display() //Shows/hides the emag item if the inventory screen is already open.
update_icons()
+ if(emagged)
+ throw_alert("hacked")
+ else
+ clear_alert("hacked")
/mob/living/silicon/robot/verb/outputlaws()
set category = "Robot Commands"
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index a04e155095f..c73a3443b09 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -68,7 +68,7 @@
if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) )
if( O.force )
user << "[src] is wearing too much armor! You can't cause \him any damage."
- visible_message(" [user] hits [src] with [O], however [src] is too armored.")
+ visible_message("[user] hits [src] with [O], however [src] is too armored.")
else
user << "[src] is wearing too much armor! You can't reach \his skin."
visible_message("[user] gently taps [src] with [O].")
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
index 3ee98de3c03..c835c1c4e79 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
@@ -112,4 +112,29 @@
/mob/living/simple_animal/drone/stripPanelEquip(obj/item/what, mob/who, where)
- ..(what, who, where, 1)
\ No newline at end of file
+ ..(what, who, where, 1)
+
+/mob/living/simple_animal/drone/verb/quick_equip()
+ set name = "quick-equip"
+ set hidden = 1
+ var/obj/item/I = get_active_hand()
+ var/obj/item/weapon/storage/S = get_inactive_hand()
+ var/obj/item/weapon/storage/T = internal_storage
+ if (!I)
+ usr << "You are not holding anything to equip!"
+ return
+ if(equip_to_appropriate_slot(I))
+ if(hand)
+ update_inv_l_hand(0)
+ else
+ update_inv_r_hand(0)
+ else if(s_active && s_active.can_be_inserted(I,1)) //if storage active insert there
+ s_active.handle_item_insertion(I)
+ else if(istype(S, /obj/item/weapon/storage) && S.can_be_inserted(I,1)) //see if we have box in other hand
+ S.handle_item_insertion(I)
+ else if (istype(T) && T.can_be_inserted(I,1)) // If carrying storage item like toolbox
+ T.handle_item_insertion(I)
+ else if(!internal_storage)
+ equip_to_slot(I, "drone_storage_slot")
+ else
+ usr << "You are unable to equip that!"
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 066d484506d..1d3e90fb8e5 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -155,6 +155,8 @@
var/T = src.loc
+ if(stat == DEAD)
+ return
if(busy != SPINNING_WEB)
busy = SPINNING_WEB
src.visible_message("\the [src] begins to secrete a sticky substance.")
@@ -171,6 +173,8 @@
set category = "Spider"
set desc = "Wrap up prey to feast upon and objects for safe keeping."
+ if(stat == DEAD)
+ return
if(!cocoon_target)
var/list/choices = list()
for(var/mob/living/L in view(1,src))
@@ -228,6 +232,8 @@
set desc = "Lay a clutch of eggs, but you must wrap a creature for feeding first."
var/obj/effect/spider/eggcluster/E = locate() in get_turf(src)
+ if(stat == DEAD)
+ return
if(E)
src << "There is already a cluster of eggs here!"
else if(!fed)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
index 9e0296844b0..b4616ae9fb7 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -41,6 +41,10 @@
return
..()
+/mob/living/simple_animal/hostile/asteroid/death(gibbed)
+ feedback_add_details("mobs_killed_mining","[src.name]")
+ ..(gibbed)
+
/mob/living/simple_animal/hostile/asteroid/basilisk
name = "basilisk"
desc = "A territorial beast, covered in a thick shell that absorbs energy. Its stare causes victims to freeze from the inside."
@@ -110,6 +114,7 @@
D.layer = 4.1
..(gibbed)
+
/mob/living/simple_animal/hostile/asteroid/goldgrub
name = "goldgrub"
desc = "A worm that grows fat from eating everything in its sight. Seems to enjoy precious metals and other shiny things, hence the name."
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 4c2abe52a30..f7f81ef7c41 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -346,16 +346,16 @@
MED.amount -= 1
if(MED.amount <= 0)
qdel(MED)
- visible_message(" [user] applies [MED] on [src].")
+ visible_message("[user] applies [MED] on [src].")
return
else
- user << " [MED] won't help at all."
+ user << "[MED] won't help at all."
return
else
- user << " [src] is at full health."
+ user << "[src] is at full health."
return
else
- user << " [src] is dead, medical items won't bring it back to life."
+ user << "[src] is dead, medical items won't bring it back to life."
return
if((butcher_results) && (stat == DEAD))
@@ -494,11 +494,11 @@
/mob/living/simple_animal/update_transform()
var/matrix/ntransform = matrix(transform) //aka transform.Copy()
var/changed = 0
-
+
if(resize != RESIZE_DEFAULT_SIZE)
changed++
ntransform.Scale(resize)
resize = RESIZE_DEFAULT_SIZE
-
+
if(changed)
- animate(src, transform = ntransform, time = 2, easing = EASE_IN|EASE_OUT)
+ animate(src, transform = ntransform, time = 2, easing = EASE_IN|EASE_OUT)
diff --git a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm
new file mode 100644
index 00000000000..267af8c2dd7
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm
@@ -0,0 +1,173 @@
+//////////////////The Monster
+
+/mob/living/simple_animal/slaughter
+ name = "Slaughter Demon"
+ real_name = "Slaughter Demon"
+ desc = "You should run."
+ speak_emote = list("gurgles")
+ emote_hear = list("wails","screeches")
+ response_help = "thinks better of touching"
+ response_disarm = "flails at"
+ response_harm = "punches"
+ icon = 'icons/mob/mob.dmi'
+ icon_state = "daemon"
+ speed = 0
+ a_intent = "harm"
+ stop_automated_movement = 1
+ status_flags = CANPUSH
+ attack_sound = 'sound/magic/demon_attack1.ogg'
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ minbodytemp = 0
+ faction = list("slaughter")
+ attacktext = "wildly tears into"
+ maxHealth = 250
+ health = 250
+ environment_smash = 1
+ melee_damage_lower = 30
+ melee_damage_upper = 30
+ see_in_dark = 8
+ see_invisible = SEE_INVISIBLE_MINIMUM
+ var/devoured = 0
+ var/phased = FALSE
+ var/holder = null
+ var/eating = FALSE
+ var/mob/living/kidnapped = null
+ var/playstyle_string = "You are the Slaughter Demon, a terible creature from another existence. You have a single desire: To kill. \
+ You may Ctrl+Click on blood pools to travel through them, appearing and dissaapearing from the station at will. \
+ Pulling a dead or critical mob while you enter a pool will pull them in with you, allowing you to feast. "
+
+
+/mob/living/simple_animal/slaughter/death()
+ ..(1)
+ new /obj/effect/decal/cleanable/blood (src.loc)
+ new /obj/item/weapon/demonheart (src.loc)
+ playsound(get_turf(src),'sound/magic/demon_dies.ogg', 200, 1)
+ visible_message("The [src] screams in anger as its form collapes into a pool of viscera.")
+ ghostize()
+ qdel(src)
+ return
+
+
+
+////////////////////The Powers
+
+/mob/living/simple_animal/slaughter/proc/phaseout(var/obj/effect/decal/cleanable/B)
+ var/turf/mobloc = get_turf(src.loc)
+ var/turf/bloodloc = get_turf(B.loc)
+ if(Adjacent(bloodloc))
+ src.notransform = TRUE
+ spawn(0)
+ src.visible_message("The [src] sinks into the pool of blood.")
+ playsound(get_turf(src), 'sound/magic/enter_blood.ogg', 100, 1, -1)
+ var/obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter( mobloc )
+ src.ExtinguishMob()
+ if(src.buckled)
+ src.buckled.unbuckle_mob()
+ if(src.pulling)
+ if(istype(src.pulling, /mob/living))
+ var/mob/living/victim = src.pulling
+ if(victim.stat == CONSCIOUS)
+ src.visible_message("[victim] kicks free of the [src] at the last second!")
+ else
+ victim.loc = holder
+ src.visible_message("The [src] drags [victim] into the pool of blood!")
+ src.kidnapped = victim
+ src.loc = holder
+ src.phased = TRUE
+ src.holder = holder
+ if(src.kidnapped)
+ src << "You being to feast on [kidnapped]. You can not move while you are doing this."
+ src.eating = TRUE
+ playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
+ sleep(30)
+ playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
+ sleep(30)
+ playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
+ sleep(30)
+ src << "You devour [kidnapped]. Your health is fully restored."
+ src.adjustBruteLoss(-1000)
+ kidnapped.ghostize()
+ qdel(kidnapped)
+ src.devoured++
+ src.kidnapped = null
+ src.eating = FALSE
+ src.notransform = 0
+
+/mob/living/simple_animal/slaughter/proc/phasein(var/obj/effect/decal/cleanable/B)
+ if(src.eating)
+ src << "Finish eating first!"
+ else
+ src.loc = B.loc
+ src.phased = FALSE
+ src.client.eye = src
+ src.visible_message("The [src] rises out of the pool of blood!")
+ playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1)
+ qdel(src.holder)
+
+/obj/effect/decal/cleanable/blood/CtrlClick(var/mob/user)
+ ..()
+ if(istype(user, /mob/living/simple_animal/slaughter))
+ var/mob/living/simple_animal/slaughter/S = user
+ if(S.phased)
+ S.phasein(src)
+ else
+ S.phaseout(src)
+
+
+/obj/effect/decal/cleanable/trail_holder/CtrlClick(var/mob/user)
+ ..()
+ if(istype(user, /mob/living/simple_animal/slaughter))
+ var/mob/living/simple_animal/slaughter/S = user
+ if(S.phased)
+ S.phasein(src)
+ else
+ S.phaseout(src)
+
+
+
+/turf/CtrlClick(var/mob/user)
+ ..()
+ if(istype(user, /mob/living/simple_animal/slaughter))
+ var/mob/living/simple_animal/slaughter/S = user
+ for(var/obj/effect/decal/cleanable/B in src.contents)
+ if(istype(B, /obj/effect/decal/cleanable/blood) || istype(B, /obj/effect/decal/cleanable/trail_holder))
+ if(S.phased)
+ S.phasein(B)
+ break
+ else
+ S.phaseout(B)
+ break
+
+/obj/effect/dummy/slaughter //Can't use the wizard one, blocked by jaunt/slow
+ name = "water"
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "nothing"
+ var/canmove = 1
+ density = 0
+ anchored = 1
+
+obj/effect/dummy/slaughter/relaymove(var/mob/user, direction)
+ if (!src.canmove || !direction) return
+ var/turf/newLoc = get_step(src,direction)
+ loc = newLoc
+ src.canmove = 0
+ spawn(1)
+ src.canmove = 1
+
+/obj/effect/dummy/slaughter/ex_act(blah)
+ return
+/obj/effect/dummy/slaughter/bullet_act(blah)
+ return
+
+/obj/effect/dummy/slaughter/singularity_act(blah)
+ return
+
+
+//////////The Loot
+
+/obj/item/weapon/demonheart
+ name = "demon's heart"
+ desc = "It's still faintly beating with rage"
+ icon = 'icons/obj/surgery.dmi'
+ icon_state = "heart-on"
+ origin_tech = "combat=5;biotech=8"
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm b/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm
new file mode 100644
index 00000000000..3db4b52bcfd
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm
@@ -0,0 +1,67 @@
+
+/datum/round_event_control/slaughter
+ name = "Spawn Slaughter Demon"
+ typepath = /datum/round_event/slaughter
+ weight = 0 //Admin only
+ max_occurrences = 1
+ earliest_start = 30 //Spawn later with more blood, hopefully
+
+
+
+/datum/round_event/slaughter
+ var/key_of_slaughter
+
+
+/datum/round_event/slaughter/proc/get_slaughter(var/end_if_fail = 0)
+ key_of_slaughter = null
+ if(!key_of_slaughter)
+ var/list/candidates = get_candidates(BE_ALIEN)
+ if(!candidates.len)
+ if(end_if_fail)
+ return 0
+ return find_slaughter()
+ var/client/C = pick(candidates)
+ key_of_slaughter = C.key
+ if(!key_of_slaughter)
+ if(end_if_fail)
+ return 0
+ return find_slaughter()
+ var/datum/mind/player_mind = new /datum/mind(key_of_slaughter)
+ player_mind.active = 1
+ var/list/spawn_locs = list()
+ for(var/obj/effect/landmark/L in landmarks_list)
+ if(isturf(L.loc))
+ switch(L.name)
+ if("carpspawn")
+ spawn_locs += L.loc
+ if(!spawn_locs)
+ return find_slaughter()
+ var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(pick(spawn_locs))
+ var/mob/living/simple_animal/slaughter/S = new /mob/living/simple_animal/slaughter/(holder)
+ S.phased = TRUE
+ player_mind.transfer_to(S)
+ player_mind.assigned_role = "Slaughter Demon"
+ player_mind.special_role = "Slaughter Demon"
+ ticker.mode.traitors |= player_mind
+ S << S.playstyle_string
+ S << "You are currently not currently in the same plane of existence as the station. Ctrl+Click a blood pool to manifest."
+ message_admins("[key_of_slaughter] has been made into a Slaughter Demon by an event.")
+ log_game("[key_of_slaughter] was spawned as a Slaughter Demon by an event.")
+ return 1
+
+
+
+/datum/round_event/slaughter/start()
+ get_slaughter()
+
+
+
+/datum/round_event/slaughter/proc/find_slaughter()
+ message_admins("Attempted to spawn a Slaughter Demon but there was no players available. Will try again momentarily.")
+ spawn(50)
+ if(get_slaughter(1))
+ message_admins("Situation has been resolved, [key_of_slaughter] has been spawned as a Slaughter Demon.")
+ log_game("[key_of_slaughter] was spawned as a Slaughter Demon by an event.")
+ return 0
+ message_admins("Unfortunately, no candidates were available for becoming a Slaugter Demon. Shutting down.")
+ return kill()
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index e3a8d4fcdef..d638788ed1d 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -235,7 +235,7 @@
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
else
- visible_message(" [M] manages to wrestle \the [name] off!")
+ visible_message("[M] manages to wrestle \the [name] off!")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
discipline_slime(M)
@@ -247,7 +247,7 @@
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
else
- visible_message(" [M] manages to wrestle \the [name] off of [Victim]!")
+ visible_message("[M] manages to wrestle \the [name] off of [Victim]!")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
discipline_slime(M)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index c5d468e9ae9..416fe4d1170 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -622,9 +622,6 @@ var/list/slot_equipment_priority = list( \
set category = "OOC"
reset_view(null)
unset_machine()
- if(istype(src, /mob/living))
- if(src:cameraFollow)
- src:cameraFollow = null
/mob/Topic(href, href_list)
if(href_list["mach_close"])
@@ -719,6 +716,7 @@ var/list/slot_equipment_priority = list( \
if(master_controller)
stat("MasterController:","[round(master_controller.cost,0.001)]ds (Interval:[master_controller.processing_interval] | Iteration:[master_controller.iteration])")
+ stat("Subsystem cost per second:","[round(master_controller.SSCostPerSecond,0.001)]ds")
for(var/datum/subsystem/SS in master_controller.subsystems)
if(SS.can_fire)
SS.stat_entry()
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 233fcd4f485..45f84087221 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -47,7 +47,7 @@
..()
//Used by throw code to hand over the mob, instead of throwing the grab. The grab is then deleted by the throw code.
-/obj/item/weapon/grab/proc/throw()
+/obj/item/weapon/grab/proc/get_mob_if_throwable()
if(affecting)
if(affecting.buckled)
return null
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 08b04e3afff..3c1906ee7dc 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -182,7 +182,7 @@
return 0
/proc/stars(n, pr)
- n = strip_html_properly(n)
+ n = html_encode(n)
if (pr == null)
pr = 25
if (pr <= 0)
diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm
index 8fd5ba2d93f..08b9a8939b2 100644
--- a/code/modules/mob/new_player/poll.dm
+++ b/code/modules/mob/new_player/poll.dm
@@ -149,7 +149,7 @@
else
output += "[O.optiontext] "
else
- output += " [O.optiontext] "
+ output += "[O.optiontext] "
output += ""
if(!voted) //Only make this a form if we have not voted yet
@@ -324,7 +324,7 @@
else
output += "[O.optiontext] "
else
- output += " [O.optiontext] "
+ output += "[O.optiontext] "
output += ""
if(!voted) //Only make this a form if we have not voted yet
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 5415474439d..e28dcc3adab 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -14,8 +14,10 @@
hair_color = random_short_color()
facial_hair_color = hair_color
eye_color = random_eye_color()
- pref_species = new /datum/species/human()
+ if(!pref_species)
+ pref_species = new /datum/species/human()
backbag = 2
+ features = random_features()
age = rand(AGE_MIN,AGE_MAX)
/datum/preferences/proc/update_preview_icon() //seriously. This is horrendous.
@@ -45,24 +47,9 @@
preview_icon = new /icon('icons/mob/human.dmi', "[skin_tone]_[g]_s")
else
preview_icon = new /icon('icons/mob/human.dmi', "[pref_species.id]_[g]_s")
- preview_icon.Blend("#[mutant_color]", ICON_MULTIPLY)
+ preview_icon.Blend("#[features["mcolor"]]", ICON_MULTIPLY)
var/datum/sprite_accessory/S
- if(underwear)
- S = underwear_list[underwear]
- if(S)
- preview_icon.Blend(new /icon(S.icon, "[S.icon_state]_s"), ICON_OVERLAY)
-
- if(undershirt)
- S = undershirt_list[undershirt]
- if(S)
- preview_icon.Blend(new /icon(S.icon, "[S.icon_state]_s"), ICON_OVERLAY)
-
- if(socks)
- S = socks_list[socks]
- if(S)
- preview_icon.Blend(new /icon(S.icon, "[S.icon_state]_s"), ICON_OVERLAY)
-
var/icon/eyes_s = new/icon()
if(EYECOLOR in pref_species.specflags)
eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = "[pref_species.eyes]_s")
@@ -90,10 +77,47 @@
for(var/layer in relevent_layers)
for(var/bodypart in pref_species.mutant_bodyparts)
- var/icon/part = new/icon("icon" = 'icons/mob/mutant_bodyparts.dmi', "icon_state" = "[icon_state_string]_[bodypart]_[layer]")
- part.Blend("#[mutant_color]", ICON_MULTIPLY)
+ switch(bodypart)
+ if("tail")
+ S = tails_list[features["tail"]]
+ if("spines")
+ S = spines_list[features["spines"]]
+ if("snout")
+ S = snouts_list[features["snout"]]
+ if("frills")
+ S = frills_list[features["frills"]]
+ if("horns")
+ S = horns_list[features["horns"]]
+ if("body_markings")
+ S = body_markings_list[features["body_markings"]]
+
+ if(!S || S.icon_state == "none")
+ continue
+ var/icon_string
+ if(S.gender_specific)
+ icon_string = "[pref_species.id]_[g]_[bodypart]_[S.icon_state]_[layer]"
+ else
+ icon_string = "[pref_species.id]_m_[bodypart]_[S.icon_state]_[layer]"
+ var/icon/part = new/icon("icon" = 'icons/mob/mutant_bodyparts.dmi', "icon_state" = icon_string)
+
+ part.Blend("#[features["mcolor"]]", ICON_MULTIPLY)
preview_icon.Blend(part, ICON_OVERLAY)
+ if(underwear)
+ S = underwear_list[underwear]
+ if(S)
+ preview_icon.Blend(new /icon(S.icon, "[S.icon_state]_s"), ICON_OVERLAY)
+
+ if(undershirt)
+ S = undershirt_list[undershirt]
+ if(S)
+ preview_icon.Blend(new /icon(S.icon, "[S.icon_state]_s"), ICON_OVERLAY)
+
+ if(socks)
+ S = socks_list[socks]
+ if(S)
+ preview_icon.Blend(new /icon(S.icon, "[S.icon_state]_s"), ICON_OVERLAY)
+
var/icon/clothes_s = null
if(job_civilian_low & ASSISTANT)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 8b42ef1bcb8..c28d4fd705c 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -41,6 +41,7 @@
var/icon_state //the icon_state of the accessory
var/name //the preview name of the accessory
var/gender = NEUTER //Determines if the accessory will be skipped or included in random hair generations
+ var/gender_specific //Something that can be worn by either gender, but looks different on each
//////////////////////
// Hair Definitions //
@@ -1046,3 +1047,232 @@
name = "Pantyhose"
icon_state = "pantyhose"
gender = FEMALE
+
+//////////.//////////////////
+// MutantParts Definitions //
+/////////////////////////////
+
+/datum/sprite_accessory/body_markings
+ icon = 'icons/mob/mutant_bodyparts.dmi'
+
+/datum/sprite_accessory/body_markings/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/body_markings/dstripe
+ name = "Dark Stripe"
+ icon_state = "dstripe"
+
+/datum/sprite_accessory/body_markings/lstripe
+ name = "Light Stripe"
+ icon_state = "lstripe"
+
+/datum/sprite_accessory/body_markings/dtiger
+ name = "Dark Tiger Body"
+ icon_state = "dtiger"
+
+/datum/sprite_accessory/body_markings/dtigerhead
+ name = "Dark Tiger Body + Head"
+ icon_state = "dtigerhead"
+
+/datum/sprite_accessory/body_markings/ltiger
+ name = "Light Tiger Body"
+ icon_state = "ltiger"
+
+/datum/sprite_accessory/body_markings/ltigerhead
+ name = "Light Tiger Body + Head"
+ icon_state = "ltigerhead"
+
+/datum/sprite_accessory/body_markings/lbelly
+ name = "Light Belly"
+ icon_state = "lbelly"
+ gender_specific = 1
+
+/datum/sprite_accessory/tails
+ icon = 'icons/mob/mutant_bodyparts.dmi'
+
+/datum/sprite_accessory/tails_animated
+ icon = 'icons/mob/mutant_bodyparts.dmi'
+
+/datum/sprite_accessory/tails/smooth
+ name = "Smooth"
+ icon_state = "smooth"
+
+/datum/sprite_accessory/tails_animated/smooth
+ name = "Smooth"
+ icon_state = "smooth"
+
+/datum/sprite_accessory/tails/light
+ name = "Light"
+ icon_state = "light"
+
+/datum/sprite_accessory/tails_animated/light
+ name = "Light"
+ icon_state = "light"
+
+/datum/sprite_accessory/tails/dstripe
+ name = "Dark Stripe"
+ icon_state = "dstripe"
+
+/datum/sprite_accessory/tails_animated/dstripe
+ name = "Dark Stripe"
+ icon_state = "dstripe"
+
+/datum/sprite_accessory/tails/lstripe
+ name = "Light Stripe"
+ icon_state = "lstripe"
+
+/datum/sprite_accessory/tails_animated/lstripe
+ name = "Light Stripe"
+ icon_state = "lstripe"
+
+/datum/sprite_accessory/tails/dtiger
+ name = "Dark Tiger"
+ icon_state = "dtiger"
+
+/datum/sprite_accessory/tails_animated/dtiger
+ name = "Dark Tiger"
+ icon_state = "dtiger"
+
+/datum/sprite_accessory/tails/ltiger
+ name = "Light Tiger"
+ icon_state = "ltiger"
+
+/datum/sprite_accessory/tails_animated/ltiger
+ name = "Light Tiger"
+ icon_state = "ltiger"
+
+/datum/sprite_accessory/tails/club
+ name = "Club"
+ icon_state = "club"
+
+/datum/sprite_accessory/tails_animated/club
+ name = "Club"
+ icon_state = "club"
+
+/datum/sprite_accessory/tails/aqua
+ name = "Aquatic"
+ icon_state = "aqua"
+
+/datum/sprite_accessory/tails_animated/aqua
+ name = "Aquatic"
+ icon_state = "aqua"
+
+/datum/sprite_accessory/snouts
+ icon = 'icons/mob/mutant_bodyparts.dmi'
+
+/datum/sprite_accessory/snouts/sharp
+ name = "Sharp"
+ icon_state = "sharp"
+
+/datum/sprite_accessory/snouts/round
+ name = "Round"
+ icon_state = "round"
+
+/datum/sprite_accessory/snouts/sharplight
+ name = "Sharp + Light"
+ icon_state = "sharplight"
+
+/datum/sprite_accessory/snouts/roundlight
+ name = "Round + Light"
+ icon_state = "roundlight"
+
+/datum/sprite_accessory/horns
+ icon = 'icons/mob/mutant_bodyparts.dmi'
+
+/datum/sprite_accessory/horns/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/horns/simple
+ name = "Simple"
+ icon_state = "simple"
+
+/datum/sprite_accessory/horns/short
+ name = "Short"
+ icon_state = "short"
+
+/datum/sprite_accessory/horns/curled
+ name = "Curled"
+ icon_state = "curled"
+
+/datum/sprite_accessory/horns/ram
+ name = "Ram"
+ icon_state = "ram"
+
+/datum/sprite_accessory/horns/angler
+ name = "Angeler"
+ icon_state = "angler"
+
+/datum/sprite_accessory/frills
+ icon = 'icons/mob/mutant_bodyparts.dmi'
+
+/datum/sprite_accessory/frills/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/frills/simple
+ name = "Simple"
+ icon_state = "simple"
+
+/datum/sprite_accessory/frills/short
+ name = "Short"
+ icon_state = "short"
+
+/datum/sprite_accessory/frills/aquatic
+ name = "Aquatic"
+ icon_state = "aqua"
+
+/datum/sprite_accessory/spines
+ icon = 'icons/mob/mutant_bodyparts.dmi'
+
+/datum/sprite_accessory/spines_animated
+ icon = 'icons/mob/mutant_bodyparts.dmi'
+
+/datum/sprite_accessory/spines/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/spines_animated/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/spines/short
+ name = "Short"
+ icon_state = "short"
+
+/datum/sprite_accessory/spines_animated/short
+ name = "Short"
+ icon_state = "short"
+
+/datum/sprite_accessory/spines/shortmeme
+ name = "Short + Membrane"
+ icon_state = "shortmeme"
+
+/datum/sprite_accessory/spines_animated/shortmeme
+ name = "Short + Membrane"
+ icon_state = "shortmeme"
+
+/datum/sprite_accessory/spines/long
+ name = "Long"
+ icon_state = "long"
+
+/datum/sprite_accessory/spines_animated/long
+ name = "Long"
+ icon_state = "long"
+
+/datum/sprite_accessory/spines/longmeme
+ name = "Long + Membrane"
+ icon_state = "longmeme"
+
+/datum/sprite_accessory/spines_animated/longmeme
+ name = "Long + Membrane"
+ icon_state = "longmeme"
+
+/datum/sprite_accessory/spines/aqautic
+ name = "Aquatic"
+ icon_state = "aqua"
+
+/datum/sprite_accessory/spines_animated/aqautic
+ name = "Aquatic"
+ icon_state = "aqua"
diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm
index 6b67a64ac3f..5bebfcb8682 100644
--- a/code/modules/nano/nanoui.dm
+++ b/code/modules/nano/nanoui.dm
@@ -261,7 +261,7 @@ nanoui is used to open and update nano browser uis
head_content += " "
for (var/filename in stylesheets)
- head_content += " "
+ head_content += ""
var/templatel_data[0]
for (var/key in templates)
diff --git a/code/modules/ninja/suit/suit_initialisation.dm b/code/modules/ninja/suit/suit_initialisation.dm
index ef1e10ba35e..621ee154caa 100644
--- a/code/modules/ninja/suit/suit_initialisation.dm
+++ b/code/modules/ninja/suit/suit_initialisation.dm
@@ -40,7 +40,7 @@
break
lock_suit(U,1)//Check for icons.
U.regenerate_icons()
- U << " Linking neural-net interface...\nPattern\green GREEN, continuing operation."
+ U << "Linking neural-net interface...\nPattern\green GREEN, continuing operation."
if(4)
U << "VOID-shift device status: ONLINE.\nCLOAK-tech device status: ONLINE."
if(5)
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 341155a3721..0554c0ab656 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -24,6 +24,9 @@
pressure_resistance = 2
var/colour = "black" //what colour the ink is!
+/obj/item/weapon/pen/suicide_act(mob/user)
+ user.visible_message("[user] is scribbling numbers all over themself with [src]! It looks like they're trying to commit sudoku!")
+ return(BRUTELOSS)
/obj/item/weapon/pen/blue
desc = "It's a normal blue ink pen."
@@ -95,24 +98,22 @@
if(user.mind in ticker.mode.A_bosses)
if(ticker.mode.add_gangster(M.mind,"A"))
M.Paralyse(5)
- cooldown(ticker.mode.A_gang.len, )
+ cooldown(max(0,ticker.mode.B_gang.len - ticker.mode.A_gang.len))
else
user << "This mind is resistant to recruitment!"
else if(user.mind in ticker.mode.B_bosses)
if(ticker.mode.add_gangster(M.mind,"B"))
M.Paralyse(5)
- cooldown(ticker.mode.B_gang.len)
+ cooldown(max(0,ticker.mode.A_gang.len - ticker.mode.B_gang.len))
else
user << "This mind is resistant to recruitment!"
else
user << "This mind is so vacant that it is not susceptible to influence!"
/obj/item/weapon/pen/gang/proc/cooldown(modifier)
- if(!modifier)
- return
cooldown = 1
icon_state = "pen_blink"
- spawn(600)
+ spawn(max(50,1200-(modifier*100)))
cooldown = 0
icon_state = "pen"
var/mob/M = get(src, /mob)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index de17516ede9..7ddb67eefeb 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -580,14 +580,10 @@
user << "Nothing happens!"
else
flick("apc-spark", src)
- if (do_after(user,6))
- if(prob(50))
- emagged = 1
- locked = 0
- user << "You emag the APC interface."
- update_icon()
- else
- user << "You fail to [ locked ? "unlock" : "lock"] the APC interface!"
+ emagged = 1
+ locked = 0
+ user << "You emag the APC interface."
+ update_icon()
// attack with hand - remove cell (if cover open) or interact with the APC
@@ -1251,4 +1247,4 @@
/obj/item/weapon/module/power_control
name = "power control module"
icon_state = "power_mod"
- desc = "Heavy-duty switching circuits for power control."
\ No newline at end of file
+ desc = "Heavy-duty switching circuits for power control."
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 96c8a2ba049..67a15e73030 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -453,7 +453,9 @@ By design, d1 is the smallest direction and d2 is the highest
// Definitions
////////////////////////////////
-
+var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \
+ new/datum/stack_recipe("cable restraints", /obj/item/weapon/restraints/handcuffs/cable, 15), \
+ )
/obj/item/stack/cable_coil
name = "cable coil"
@@ -501,6 +503,7 @@ By design, d1 is the smallest direction and d2 is the highest
pixel_x = rand(-2,2)
pixel_y = rand(-2,2)
update_icon()
+ recipes = cable_coil_recipes
///////////////////////////////////
// General procedures
@@ -533,38 +536,12 @@ By design, d1 is the smallest direction and d2 is the highest
icon_state = "coil_[item_color]"
name = "cable coil"
-/obj/item/stack/cable_coil/verb/make_restraint()
- set name = "Make Cable Restraints"
- set category = "Object"
- var/mob/M = usr
-
- if(ishuman(M) && !M.restrained() && !M.stat && M.canmove)
- if(!istype(usr.loc,/turf))
- return
- if(src.amount <= 14)
- usr << "You need at least 15 lengths to make restraints!"
- return
- var/obj/item/weapon/restraints/handcuffs/cable/B = new /obj/item/weapon/restraints/handcuffs/cable(usr.loc)
- B.icon_state = "cuff_[item_color]"
- usr << "You wind some cable together to make some restraints."
- src.use(15)
- else
- usr << "You cannot do that!"
- ..()
// Items usable on a cable coil :
-// - Wirecutters : cut them duh !
// - Cable coil : merge cables
/obj/item/stack/cable_coil/attackby(obj/item/weapon/W, mob/user, params)
..()
- if( istype(W, /obj/item/weapon/wirecutters) && src.amount > 1)
- src.amount--
- new /obj/item/stack/cable_coil(user.loc, 1,item_color)
- user << "You cut a piece off the cable coil."
- src.update_icon()
- return
-
- else if(istype(W, /obj/item/stack/cable_coil/cyborg))
+ if(istype(W, /obj/item/stack/cable_coil/cyborg))
var/obj/item/stack/cable_coil/cyborg/C = W
var/to_transfer = min(src.amount, round((C.source.max_energy - C.source.energy) / C.cost))
C.add(to_transfer)
@@ -588,22 +565,6 @@ By design, d1 is the smallest direction and d2 is the highest
src.use(amt)
return
-//remove cables from the stack
-/* This is probably reduntant
-/obj/item/stack/cable_coil/use(var/used)
- if(src.amount < used)
- return 0
- else if (src.amount == used)
- if(ismob(loc)) //handle mob icon update
- var/mob/M = loc
- M.unEquip(src)
- qdel(src)
- return 1
- else
- amount -= used
- update_icon()
- return 1
-*/
/obj/item/stack/cable_coil/use(var/used)
. = ..()
update_icon()
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 125d19729e9..d90d7280cd2 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -43,6 +43,8 @@
return 0
if(charge < amount) return 0
charge = (charge - amount)
+ if(!istype(loc, /obj/machinery/power/apc))
+ feedback_add_details("cell_used","[src.name]")
return 1
// recharge the cell
@@ -217,6 +219,19 @@
..()
charge = 0
+/obj/item/weapon/stock_parts/cell/bluespace
+ name = "bluespace power cell"
+ origin_tech = "powerstorage=7"
+ icon_state = "bscell"
+ maxcharge = 40000
+ g_amt = 80
+ rating = 6
+ chargerate = 4000
+
+/obj/item/weapon/stock_parts/cell/bluespace/empty/New()
+ ..()
+ charge = 0
+
/obj/item/weapon/stock_parts/cell/infinite
name = "infinite-capacity power cell!"
icon_state = "icell"
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 9a09974598c..92d7b8105c1 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -16,11 +16,36 @@
var/active = 0
var/powered = 0
var/fire_delay = 100
+ var/maximum_fire_delay = 100
+ var/minimum_fire_delay = 20
var/last_shot = 0
var/shot_number = 0
var/state = 0
var/locked = 0
+/obj/machinery/power/emitter/New()
+ ..()
+ component_parts = list()
+ component_parts += new /obj/item/weapon/circuitboard/emitter(null)
+ component_parts += new /obj/item/weapon/stock_parts/micro_laser(null)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
+ RefreshParts()
+
+/obj/machinery/power/emitter/RefreshParts()
+ var/max_firedelay = 120
+ var/firedelay = 120
+ var/min_firedelay = 24
+ var/power_usage = 350
+ for(var/obj/item/weapon/stock_parts/micro_laser/L in component_parts)
+ max_firedelay -= 20 * L.rating
+ min_firedelay -= 4 * L.rating
+ firedelay -= 20 * L.rating
+ maximum_fire_delay = max_firedelay
+ minimum_fire_delay = min_firedelay
+ fire_delay = firedelay
+ for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
+ power_usage -= 50 * M.rating
+ active_power_usage = power_usage
/obj/machinery/power/emitter/verb/rotate()
set name = "Rotate"
@@ -71,7 +96,7 @@
src.active = 1
user << "You turn on \the [src]."
src.shot_number = 0
- src.fire_delay = 100
+ src.fire_delay = maximum_fire_delay
investigate_log("turned on by [user.key]","singulo")
update_icon()
else
@@ -119,7 +144,7 @@
src.fire_delay = 2
src.shot_number ++
else
- src.fire_delay = rand(20,100)
+ src.fire_delay = rand(minimum_fire_delay,maximum_fire_delay)
src.shot_number = 0
var/obj/item/projectile/beam/emitter/A = PoolOrNew(/obj/item/projectile/beam/emitter,src.loc)
@@ -221,6 +246,17 @@
user << "Access denied."
return
+ if(default_deconstruction_screwdriver(user, "emitter_open", "emitter", W))
+ return
+
+ if(exchange_parts(user, W))
+ return
+
+ if(default_pry_open(W))
+ return
+
+ default_deconstruction_crowbar(W)
+
..()
return
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 85d8089d926..9a30df83891 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -25,6 +25,7 @@
var/target = null //its target. moves towards the target if it has one
var/last_failed_movement = 0//Will not move in the same dir if it couldnt before, will help with the getting stuck on fields thing
var/last_warning
+ var/consumedSupermatter = 0 //If the singularity has eaten a supermatter shard and can go to stage six
allow_spin = 0
/obj/singularity/New(loc, var/starting_energy = 50, var/temp = 0)
//CARN: admin-alert for chuckle-fuckery.
@@ -129,6 +130,8 @@
var/temp_allowed_size = src.allowed_size
if(force_size)
temp_allowed_size = force_size
+ if(temp_allowed_size >= STAGE_SIX && !consumedSupermatter)
+ temp_allowed_size = STAGE_FIVE
switch(temp_allowed_size)
if(STAGE_ONE)
current_size = STAGE_ONE
@@ -185,6 +188,15 @@
grav_pull = 10
consume_range = 4
dissipate = 0 //It cant go smaller due to e loss
+ if(STAGE_SIX) //This only happens if a stage 5 singulo consumes a supermatter shard.
+ current_size = STAGE_SIX
+ icon = 'icons/effects/352x352.dmi'
+ icon_state = "singularity_s11"
+ pixel_x = -160
+ pixel_y = -160
+ grav_pull = 15
+ consume_range = 5
+ dissipate = 0
if(current_size == allowed_size)
investigate_log("grew to size [current_size]","singulo")
return 1
@@ -199,6 +211,8 @@
investigate_log("collapsed.","singulo")
qdel(src)
return 0
+ if(energy > 2999 && !consumedSupermatter)
+ energy = 2000
switch(energy)//Some of these numbers might need to be changed up later -Mport
if(1 to 199)
allowed_size = STAGE_ONE
@@ -208,8 +222,10 @@
allowed_size = STAGE_THREE
if(1000 to 1999)
allowed_size = STAGE_FOUR
- if(2000 to INFINITY)
+ if(2000 to 2999)
allowed_size = STAGE_FIVE
+ if(3000 to INFINITY)
+ allowed_size = STAGE_SIX
if(current_size != allowed_size)
expand()
return 1
@@ -230,6 +246,11 @@
/obj/singularity/proc/consume(var/atom/A)
var/gain = A.singularity_act(current_size)
src.energy += gain
+ if(istype(A, /obj/machinery/power/supermatter_shard) && !consumedSupermatter)
+ desc = "[initial(desc)] It glows fiercely with inner fire."
+ name = "supermatter-charged [initial(name)]"
+ consumedSupermatter = 1
+ luminosity = 10
return
@@ -326,6 +347,10 @@
toxmob()
if(4)//Stun mobs who lack optic scanners
mezzer()
+ if(5,6) //Sets all nearby mobs on fire
+ if(current_size < STAGE_SIX)
+ return 0
+ combust_mobs()
else
return 0
return 1
@@ -347,6 +372,15 @@
return
+/obj/singularity/proc/combust_mobs()
+ for(var/mob/living/carbon/C in orange(20, src))
+ C.visible_message("[C]'s skin bursts into flame!", \
+ "You feel an inner fire as your skin is suddenly covered in fire!")
+ C.adjust_fire_stacks(5)
+ C.IgniteMob()
+ return
+
+
/obj/singularity/proc/mezzer()
for(var/mob/living/carbon/M in oviewers(8, src))
if(istype(M, /mob/living/carbon/brain)) //Ignore brains
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 77c4aa75751..1c8838e4311 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -274,11 +274,13 @@
name = "solar panel control"
desc = "A controller for solar panel arrays."
icon = 'icons/obj/computer.dmi'
- icon_state = "solar"
+ icon_state = "computer"
anchored = 1
density = 1
use_power = 1
idle_power_usage = 250
+ var/icon_screen = "solar"
+ var/icon_keyboard = "power_key"
var/id = 0
var/cdir = 0
var/targetdir = 0 // target angle in manual tracking (since it updates every game minute)
@@ -351,19 +353,17 @@
set_panels(cdir)
/obj/machinery/power/solar_control/update_icon()
- if(stat & BROKEN)
- icon_state = "broken"
- overlays.Cut()
- return
- if(stat & NOPOWER)
- icon_state = "c_unpowered"
- overlays.Cut()
- return
- icon_state = "solar"
overlays.Cut()
+ if(stat & NOPOWER)
+ overlays += "[icon_keyboard]_off"
+ return
+ overlays += icon_keyboard
+ if(stat & BROKEN)
+ overlays += "[icon_state]_broken"
+ else
+ overlays += icon_screen
if(cdir > -1)
overlays += image('icons/obj/computer.dmi', "solcon-o", FLY_LAYER, angle2dir(cdir))
- return
/obj/machinery/power/solar_control/attack_hand(mob/user)
if(!..())
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index a04bf8dda44..dfab6aa6c08 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -18,7 +18,7 @@
/obj/machinery/power/supermatter_shard
name = "supermatter shard"
- desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. You get headaches just from looking at it."
+ desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. You get headaches just from looking at it."
icon = 'icons/obj/supermatter.dmi'
icon_state = "darkmatter_shard"
density = 1
@@ -187,6 +187,7 @@
return 1
+/obj/machinery/power/supermatter_shard
/obj/machinery/power/supermatter_shard/bullet_act(var/obj/item/projectile/Proj)
var/turf/L = loc
@@ -205,6 +206,16 @@
damage += Proj.damage * config_bullet_energy
return 0
+/obj/machinery/power/supermatter_shard/singularity_act()
+ var/gain = 100
+ investigate_log("Supermatter shard consumed by singularity.","singulo")
+ message_admins("Singularity has consumed a supermatter shard and can now become stage six.")
+ visible_message("[src] is consumed by the singularity!")
+ for(var/mob/M in mob_list)
+ M << 'sound/effects/supermatter.ogg' //everyone goan know bout this
+ M << "A horrible screeching fills your ears, and a wave of dread washes over you..."
+ qdel(src)
+ return(gain)
/obj/machinery/power/supermatter_shard/attack_paw(mob/user as mob)
return attack_hand(user)
@@ -214,11 +225,11 @@
if(Adjacent(user))
return attack_hand(user)
else
- user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update."
+ user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update."
return
/obj/machinery/power/supermatter_shard/attack_ai(mob/user as mob)
- user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update."
+ user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update."
/obj/machinery/power/supermatter_shard/attack_hand(mob/living/user as mob)
if(!istype(user))
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index 86e3930b58a..405880f4249 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -56,10 +56,8 @@
/obj/machinery/computer/turbine_computer
name = "gas turbine control computer"
desc = "A computer to remotely control a gas turbine"
- icon = 'icons/obj/computer.dmi'
- icon_state = "turbinecomp"
- anchored = 1
- density = 1
+ icon_screen = "turbinecomp"
+ icon_keyboard = "tech_key"
circuit = /obj/item/weapon/circuitboard/turbine_computer
var/obj/machinery/power/compressor/compressor
var/id = 0
diff --git a/code/modules/procedural mapping/mapGeneratorModules/helpers.dm b/code/modules/procedural mapping/mapGeneratorModules/helpers.dm
new file mode 100644
index 00000000000..bad449a9e8f
--- /dev/null
+++ b/code/modules/procedural mapping/mapGeneratorModules/helpers.dm
@@ -0,0 +1,44 @@
+//Helper Modules
+
+
+// Helper to repressurize the area in case it was run in space
+/datum/mapGeneratorModule/bottomLayer/repressurize
+ spawnableAtoms = list()
+ spawnableTurfs = list()
+
+/datum/mapGeneratorModule/bottomLayer/repressurize/generate()
+ if(!mother)
+ return
+ var/list/map = mother.map
+ for(var/turf/simulated/T in map)
+ SSair.remove_from_active(T)
+ for(var/turf/simulated/T in map)
+ if(T.air)
+ T.air.oxygen = T.oxygen
+ T.air.nitrogen = T.nitrogen
+ T.air.carbon_dioxide = T.carbon_dioxide
+ T.air.toxins = T.toxins
+ T.air.temperature = T.temperature
+ SSair.add_to_active(T)
+
+//Only places atoms/turfs on area borders
+/datum/mapGeneratorModule/border
+ clusterCheckFlags = CLUSTER_CHECK_NONE
+
+/datum/mapGeneratorModule/border/generate()
+ if(!mother)
+ return
+ var/list/map = mother.map
+ for(var/turf/T in map)
+ if(is_border(T))
+ place(T)
+
+/datum/mapGeneratorModule/border/proc/is_border(var/turf/T)
+ for(var/direction in list(SOUTH,EAST,WEST,NORTH))
+ if (get_step(T,direction) in mother.map)
+ continue
+ return 1
+ return 0
+
+/datum/mapGenerator/repressurize
+ modules = list(/datum/mapGeneratorModule/bottomLayer/repressurize)
\ No newline at end of file
diff --git a/code/modules/procedural mapping/mapGenerators/asteroid.dm b/code/modules/procedural mapping/mapGenerators/asteroid.dm
new file mode 100644
index 00000000000..4dc002aa56a
--- /dev/null
+++ b/code/modules/procedural mapping/mapGenerators/asteroid.dm
@@ -0,0 +1,45 @@
+//Asteroid turfs
+/datum/mapGeneratorModule/bottomLayer/asteroidTurfs
+ spawnableTurfs = list(/turf/simulated/floor/plating/asteroid = 100)
+
+/datum/mapGeneratorModule/bottomLayer/asteroidWalls
+ spawnableTurfs = list(/turf/simulated/mineral = 100)
+
+//Border walls
+/datum/mapGeneratorModule/border/asteroidWalls
+ spawnableAtoms = list()
+ spawnableTurfs = list(/turf/simulated/mineral = 100)
+
+//Random walls
+/datum/mapGeneratorModule/splatterLayer/asteroidWalls
+ clusterCheckFlags = CLUSTER_CHECK_NONE
+ spawnableAtoms = list()
+ spawnableTurfs = list(/turf/simulated/mineral = 30)
+
+//Monsters
+/datum/mapGeneratorModule/splatterLayer/asteroidMonsters
+ spawnableTurfs = list()
+ spawnableAtoms = list(/mob/living/simple_animal/hostile/asteroid/basilisk = 10, \
+ /mob/living/simple_animal/hostile/asteroid/hivelord = 10, \
+ /mob/living/simple_animal/hostile/asteroid/goliath = 10)
+
+
+// GENERATORS
+
+/datum/mapGenerator/asteroid/hollow
+ modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidTurfs, \
+ /datum/mapGeneratorModule/border/asteroidWalls)
+
+/datum/mapGenerator/asteroid/hollow/random
+ modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidTurfs, \
+ /datum/mapGeneratorModule/border/asteroidWalls, \
+ /datum/mapGeneratorModule/splatterLayer/asteroidWalls)
+
+/datum/mapGenerator/asteroid/hollow/random/monsters
+ modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidTurfs, \
+ /datum/mapGeneratorModule/border/asteroidWalls, \
+ /datum/mapGeneratorModule/splatterLayer/asteroidWalls, \
+ /datum/mapGeneratorModule/splatterLayer/asteroidMonsters)
+
+/datum/mapGenerator/asteroid/filled
+ modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidWalls)
\ No newline at end of file
diff --git a/code/modules/procedural mapping/mapGenerators/shuttle.dm b/code/modules/procedural mapping/mapGenerators/shuttle.dm
new file mode 100644
index 00000000000..7197b127d48
--- /dev/null
+++ b/code/modules/procedural mapping/mapGenerators/shuttle.dm
@@ -0,0 +1,15 @@
+/datum/mapGeneratorModule/bottomLayer/shuttleFloor
+ spawnableTurfs = list(/turf/simulated/floor/plasteel/shuttle = 100)
+
+/datum/mapGeneratorModule/border/shuttleWalls
+ spawnableAtoms = list()
+ spawnableTurfs = list(/turf/simulated/wall/shuttle = 100)
+// Generators
+
+/datum/mapGenerator/shuttle/full
+ modules = list(/datum/mapGeneratorModule/bottomLayer/shuttleFloor, \
+ /datum/mapGeneratorModule/border/shuttleWalls,\
+ /datum/mapGeneratorModule/bottomLayer/repressurize)
+
+/datum/mapGenerator/shuttle/floor
+ modules = list(/datum/mapGeneratorModule/bottomLayer/shuttleFloor)
diff --git a/code/modules/procedural mapping/mapGenerators/syndicate.dm b/code/modules/procedural mapping/mapGenerators/syndicate.dm
new file mode 100644
index 00000000000..e48fe718d00
--- /dev/null
+++ b/code/modules/procedural mapping/mapGenerators/syndicate.dm
@@ -0,0 +1,52 @@
+// Modules
+
+/turf/simulated/floor/plasteel/shuttle/red/syndicate
+ name = "floor" //Not Brig Floor
+
+/datum/mapGeneratorModule/bottomLayer/syndieFloor
+ spawnableTurfs = list(/turf/simulated/floor/plasteel/shuttle/red/syndicate = 100)
+
+/datum/mapGeneratorModule/border/syndieWalls
+ spawnableAtoms = list()
+ spawnableTurfs = list(/turf/simulated/wall/r_wall = 100)
+
+
+/datum/mapGeneratorModule/syndieFurniture
+ clusterCheckFlags = CLUSTER_CHECK_ALL
+ spawnableTurfs = list()
+ spawnableAtoms = list(/obj/structure/table = 20,/obj/structure/stool/bed/chair = 15,/obj/structure/stool = 10, \
+ /obj/structure/computerframe = 15, /obj/item/weapon/storage/toolbox/syndicate = 15 ,\
+ /obj/structure/closet/syndicate = 25, /obj/machinery/suit_storage_unit/syndicate = 15)
+
+/datum/mapGeneratorModule/splatterLayer/syndieMobs
+ spawnableAtoms = list(/mob/living/simple_animal/hostile/syndicate = 30, \
+ /mob/living/simple_animal/hostile/syndicate/melee = 20, \
+ /mob/living/simple_animal/hostile/syndicate/ranged = 20, \
+ /mob/living/simple_animal/hostile/viscerator = 30)
+ spawnableTurfs = list()
+
+// Generators
+
+/datum/mapGenerator/syndicate/empty //walls and floor only
+ modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \
+ /datum/mapGeneratorModule/border/syndieWalls,\
+ /datum/mapGeneratorModule/bottomLayer/repressurize)
+
+/datum/mapGenerator/syndicate/mobsonly
+ modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \
+ /datum/mapGeneratorModule/border/syndieWalls,\
+ /datum/mapGeneratorModule/splatterLayer/syndieMobs, \
+ /datum/mapGeneratorModule/bottomLayer/repressurize)
+
+/datum/mapGenerator/syndicate/furniture
+ modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \
+ /datum/mapGeneratorModule/border/syndieWalls,\
+ /datum/mapGeneratorModule/syndieFurniture, \
+ /datum/mapGeneratorModule/bottomLayer/repressurize)
+
+/datum/mapGenerator/syndicate/full
+ modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \
+ /datum/mapGeneratorModule/border/syndieWalls,\
+ /datum/mapGeneratorModule/syndieFurniture, \
+ /datum/mapGeneratorModule/splatterLayer/syndieMobs, \
+ /datum/mapGeneratorModule/bottomLayer/repressurize)
\ No newline at end of file
diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm
index 48f4b74cd9c..3e363056825 100644
--- a/code/modules/projectiles/ammunition/ammo_casings.dm
+++ b/code/modules/projectiles/ammunition/ammo_casings.dm
@@ -31,7 +31,6 @@
caliber = ".45"
projectile_type = /obj/item/projectile/bullet/midbullet
-
/obj/item/ammo_casing/shotgun
name = "shotgun slug"
desc = "A 12 gauge lead slug."
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index b1296f8b2cf..342f7234c62 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -157,11 +157,11 @@
..()
icon_state = "c20r45-[round(ammo_count(),2)]"
-obj/item/ammo_box/magazine/tommygunm45
- name = "drum magazine (.45)"
+obj/item/ammo_box/magazine/tommygunm9mm
+ name = "drum magazine (9mm)"
icon_state = "drum45"
- ammo_type = /obj/item/ammo_casing/c45
- caliber = ".45"
+ ammo_type = /obj/item/ammo_casing/c9mm
+ caliber = "9mm"
max_ammo = 50
/obj/item/ammo_box/magazine/m50
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 4cc38cb4fc2..9b1666fd2f0 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -132,6 +132,7 @@
process_fire(target,user,1,params)
+
/obj/item/weapon/gun/proc/can_trigger_gun(mob/living/carbon/user)
if (!user.IsAdvancedToolUser())
user << "You don't have the dexterity to do this!"
@@ -218,7 +219,7 @@
user.update_inv_l_hand(0)
else
user.update_inv_r_hand(0)
-
+ feedback_add_details("gun_fired","[src.name]")
/obj/item/weapon/gun/attack(mob/M as mob, mob/user)
if(user.a_intent == "harm") //Flogging
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index fdec6f437b9..badf178b878 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -230,13 +230,14 @@
return
/obj/item/weapon/gun/projectile/automatic/tommygun
- name = "tommy gun"
- desc = "A genuine 'Chicago Typewriter'."
+ name = "thompson SMG"
+ desc = "Based on the classic 'Chicago Typewriter'."
icon_state = "tommygun"
item_state = "shotgun"
+ w_class = 5
slot_flags = 0
origin_tech = "combat=5;materials=1;syndicate=2"
- mag_type = /obj/item/ammo_box/magazine/tommygunm45
+ mag_type = /obj/item/ammo_box/magazine/tommygunm9mm
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
can_suppress = 0
burst_size = 4
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 471b5401196..7178c36469f 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -37,7 +37,7 @@
CB.update_icon()
num_unloaded++
if (num_unloaded)
- user << "You unload [num_unloaded] shell\s from [src]."
+ user << "You unload [num_unloaded] shell\s from [src]."
else
user << "[src] is empty!"
@@ -170,7 +170,7 @@
CB.update_icon()
num_unloaded++
if (num_unloaded)
- user << "You unload [num_unloaded] shell\s from [src]."
+ user << "You unload [num_unloaded] shell\s from [src]."
else
user << "[src] is empty."
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index e5d5b462c6d..2d0da86aed1 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -173,7 +173,7 @@
CB.update_icon()
num_unloaded++
if (num_unloaded)
- user << "You break open \the [src] and unload [num_unloaded] shell\s."
+ user << "You break open \the [src] and unload [num_unloaded] shell\s."
else
user << "[src] is empty!"
diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm
index 2fb641d6c56..f0a17314848 100644
--- a/code/modules/projectiles/guns/syringe_gun.dm
+++ b/code/modules/projectiles/guns/syringe_gun.dm
@@ -56,7 +56,7 @@
S.loc = user.loc
syringes.Remove(S)
- user << "You unload [S] from \the [src]."
+ user << "You unload [S] from \the [src]."
return 1
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 9542c6a289d..8fc1a4622f9 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -16,7 +16,7 @@
var/atom/original = null // the original target clicked
var/turf/starting = null // the projectile's starting turf
var/list/permutated = list() // we've passed through these atoms, don't try to hit them again
-
+ var/paused = FALSE //for suspending the projectile midair
var/p_x = 16
var/p_y = 16 // the pixel location of the tile that the player clicked. Default is the center
@@ -108,7 +108,6 @@
loc = target_turf
if(A)
permutated.Add(A)
- Range()
return 0
else
if(A && A.density && !ismob(A) && !(A.flags & ON_BORDER)) //if we hit a dense non-border obj or dense turf then we also hit one of the mobs on that tile.
@@ -130,17 +129,19 @@
if(kill_count < 1)
qdel(src)
return
- kill_count--
- if((!( current ) || loc == current))
- current = locate(Clamp(x+xo,1,world.maxx),Clamp(y+yo,1,world.maxy),z)
- step_towards(src, current)
- if((original && original.layer>=2.75) || ismob(original))
- if(loc == get_turf(original))
- if(!(original in permutated))
- Bump(original, 1)
+ if(!paused)
+ kill_count--
+ if((!( current ) || loc == current))
+ current = locate(Clamp(x+xo,1,world.maxx),Clamp(y+yo,1,world.maxy),z)
+ step_towards(src, current)
+ if((original && original.layer>=2.75) || ismob(original))
+ if(loc == get_turf(original))
+ if(!(original in permutated))
+ Bump(original, 1)
Range()
sleep(1)
+
/obj/item/projectile/Crossed(atom/movable/AM as mob) //A mob moving on a tile with a projectile is hit by it.
..()
if(isliving(AM) && AM.density && !checkpass(PASSMOB))
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index e87808254e6..00cd2fc1a42 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -30,6 +30,7 @@
icon_state = "xray"
damage = 15
irradiate = 30
+ range = 15
forcedodge = 1
/obj/item/projectile/beam/disabler
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index d2f5b3bcc38..efc20cedfd7 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -227,9 +227,10 @@
ready_dna(H)
if(H.dna && prob(50))
var/list/all_species = list()
- for(var/datum/species/S in typesof(/datum/species) - /datum/species)
+ for(var/speciestype in typesof(/datum/species) - /datum/species)
+ var/datum/species/S = new speciestype()
if(!S.dangerous_existence)
- all_species += S
+ all_species += speciestype
hardset_dna(H, null, null, null, null, pick(all_species))
H.update_icons()
else
@@ -268,7 +269,7 @@
S.icon = change.icon
if(H.mind)
H.mind.transfer_to(S)
- S << "You are an animate statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved! Do not harm [firer.name], your creator."
+ S << "You are an animate statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved! Do not harm [firer.name], your creator."
H = change
H.loc = S
qdel(src)
diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index 49461bfc6fc..94e40614ab8 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -260,7 +260,7 @@ var/const/INGEST = 2
R.addiction_act_stage4(M)
R.addiction_stage++
if(R.addiction_stage > 40)
- M << "You feel like you've gotten over your need for [R.name]."
+ M << "You feel like you've gotten over your need for [R.name]."
addiction_list.Remove(R)
addiction_tick++
update_total()
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 92235739bdb..3dab9a3442a 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -192,7 +192,8 @@
dispensable_reagents = list()
var/list/special_reagents = list(list("hydrogen", "oxygen", "silicon", "phosphorus", "sulfur", "carbon", "nitrogen", "water"),
list("lithium", "sugar", "sacid", "copper", "mercury", "sodium","iodine","bromine"),
- list("ethanol", "chlorine", "potassium", "aluminium", "radium", "fluorine", "iron", "welding_fuel","silver","stable_plasma"))
+ list("ethanol", "chlorine", "potassium", "aluminium", "radium", "fluorine", "iron", "welding_fuel","silver","stable_plasma"),
+ list("oil", "ash", "acetone", "saltpetre", "ammonia", "diethylamine"))
/obj/machinery/chem_dispenser/constructable/New()
..()
@@ -1244,9 +1245,12 @@
if (!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume))
return
playsound(src.loc, 'sound/machines/juicer.ogg', 20, 1)
+ var/offset = prob(50) ? -2 : 2
+ animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 250) //start shaking
operating = 1
updateUsrDialog()
spawn(50)
+ pixel_x = initial(pixel_x) //return to its spot after shaking
operating = 0
updateUsrDialog()
@@ -1279,9 +1283,12 @@
if (!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume))
return
playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
+ var/offset = prob(50) ? -2 : 2
+ animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 250) //start shaking
operating = 1
updateUsrDialog()
spawn(60)
+ pixel_x = initial(pixel_x) //return to its spot after shaking
operating = 0
updateUsrDialog()
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 2dede1c153d..2934c57a3c0 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -115,26 +115,26 @@
return
/datum/reagent/proc/overdose_start(var/mob/living/M as mob)
- M << "You feel like you took too much of [name]!"
+ M << "You feel like you took too much of [name]!"
return
/datum/reagent/proc/addiction_act_stage1(var/mob/living/M as mob)
if(prob(30))
- M << "You feel like some [name] right about now."
+ M << "You feel like some [name] right about now."
return
/datum/reagent/proc/addiction_act_stage2(var/mob/living/M as mob)
if(prob(30))
- M << "You feel like you need [name]. You just can't get enough."
+ M << "You feel like you need [name]. You just can't get enough."
return
/datum/reagent/proc/addiction_act_stage3(var/mob/living/M as mob)
if(prob(30))
- M << "You have an intense craving for [name]."
+ M << "You have an intense craving for [name]."
return
/datum/reagent/proc/addiction_act_stage4(var/mob/living/M as mob)
if(prob(30))
- M << "You're not feeling good at all! You really need some [name]."
+ M << "You're not feeling good at all! You really need some [name]."
return
diff --git a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
index a764dc654bf..c9ade32e68b 100644
--- a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
@@ -211,4 +211,4 @@
if(message_living && !issilicon(M))
totalmessage += message_living
totalmessage += "!"
- M << "[totalmessage]"
\ No newline at end of file
+ M << "[totalmessage]"
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
index 1ea2c600caa..7fd49928443 100644
--- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
@@ -57,7 +57,7 @@
overdose_threshold = 200 // Hyperglycaemic shock
/datum/reagent/consumable/sugar/overdose_start(var/mob/living/M as mob)
- M << "You go into hyperglycaemic shock! Lay off the twinkies!"
+ M << "You go into hyperglycaemic shock! Lay off the twinkies!"
M.sleeping += 30
return
diff --git a/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm
index 0b9f8c70847..579caddc98a 100644
--- a/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm
@@ -172,7 +172,7 @@
if(prob(20))
M.emote("laugh")
if(prob(33))
- M.visible_message("[M]'s hands flip out and flail everywhere!")
+ M.visible_message("[M]'s hands flip out and flail everywhere!")
var/obj/item/I = M.get_active_hand()
if(I)
M.drop_item()
diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
index e65a5e81de4..bbb31522bbb 100644
--- a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
@@ -494,7 +494,7 @@
if(3)
var/mob/living/carbon/human/H = M
if(!H.heart_attack)
- H.visible_message("[H] clutches at their chest as if their heart stopped!")
+ H.visible_message("[H] clutches at their chest as if their heart stopped!")
H.heart_attack = 1 // rip in pepperoni
else
H.losebreath += 10
diff --git a/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm b/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm
index fedbc5d0904..4b265fae1b9 100644
--- a/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm
@@ -59,7 +59,7 @@
required_reagents = list("blackpowder" = 1)
result_amount = 1
required_temp = 474
- mix_message = "Sparks start flying around the black powder!"
+ mix_message = "Sparks start flying around the black powder!"
/datum/chemical_reaction/blackpowder_explosion/on_reaction(var/datum/reagents/holder, var/created_volume)
sleep(rand(50,100))
diff --git a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm
index be029b2220a..7c26d80e4c2 100644
--- a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm
@@ -533,11 +533,29 @@
P.loc = get_turf(holder.my_atom)
//Sepia
+/datum/chemical_reaction/slimestop
+ name = "Slime Stop"
+ id = "m_stop"
+ result = null
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/sepia
+ required_other = 1
+
+/datum/chemical_reaction/slimestop/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ var/mob/mob = get_mob_by_key(holder.my_atom.fingerprintslast)
+ var/obj/effect/timestop/T = new /obj/effect/timestop
+ T.loc = get_turf(holder.my_atom)
+ T.immune = mob
+ T.timestop()
+
+
/datum/chemical_reaction/slimecamera
name = "Slime Camera"
id = "m_camera"
result = null
- required_reagents = list("plasma" = 1)
+ required_reagents = list("blood" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/sepia
required_other = 1
@@ -551,7 +569,7 @@
name = "Slime Film"
id = "m_film"
result = null
- required_reagents = list("blood" = 1)
+ required_reagents = list("water" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/sepia
required_other = 1
@@ -561,7 +579,10 @@
var/obj/item/device/camera_film/P = new /obj/item/device/camera_film
P.loc = get_turf(holder.my_atom)
+
//Pyrite
+
+
/datum/chemical_reaction/slimepaint
name = "Slime Paint"
id = "s_paint"
@@ -577,4 +598,4 @@
var/chosen = pick(paints)
var/obj/P = new chosen
if(P)
- P.loc = get_turf(holder.my_atom)
\ No newline at end of file
+ P.loc = get_turf(holder.my_atom)
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index f4304ba596a..d3c923f6e2c 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -23,7 +23,7 @@ Borg Hypospray
var/recharge_time = 5 //Time it takes for shots to recharge (in seconds)
var/list/datum/reagents/reagent_list = list()
- var/list/reagent_ids = list("salbutamol", "salglu_solution", "charcoal", "epinephrine", "spaceacillin")
+ var/list/reagent_ids = list("dexalin", "kelotane", "bicaridine", "antitoxin", "epinephrine", "spaceacillin")
//var/list/reagent_ids = list("salbutamol", "salglu_solution", "salglu_solution", "charcoal", "ephedrine", "spaceacillin")
var/list/modes = list() //Basically the inverse of reagent_ids. Instead of having numbers as "keys" and strings as values it has strings as keys and numbers as values.
//Used as list for input() in shakers.
@@ -199,4 +199,4 @@ Borg Shaker
charge_cost = 20 //Lots of reagents all regenerating at once, so the charge cost is lower. They also regenerate faster.
recharge_time = 3
- reagent_ids = list("beer2")
\ No newline at end of file
+ reagent_ids = list("beer2")
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 90bcb8ea638..d3fa4a658a6 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -110,7 +110,7 @@
if(istype(I, /obj/item/weapon/storage/bag/trash))
var/obj/item/weapon/storage/bag/trash/T = I
- user << " You empty the bag."
+ user << "You empty the bag."
for(var/obj/item/O in T.contents)
T.remove_from_storage(O,src)
T.update_icon()
@@ -345,7 +345,8 @@
src.updateDialog()
if(flush && air_contents.return_pressure() >= SEND_PRESSURE ) // flush can happen even without power
- flush()
+ spawn(0)
+ flush()
if(stat & NOPOWER) // won't charge if no power
return
@@ -378,39 +379,32 @@
update()
return
-// perform a flush
/obj/machinery/disposal/proc/flush()
-
flushing = 1
- flick("[icon_state]-flush", src)
-
- var/wrapcheck = 0
- var/obj/structure/disposalholder/H = new() // virtual holder object which actually
- // travels through the pipes.
- for(var/obj/item/smallDelivery/O in src)
- wrapcheck = 1
-
- if(wrapcheck == 1)
- H.tomail = 1
-
+ flushAnimation()
+ var/obj/structure/disposalholder/H = new()
+ newHolderDestination(H)
sleep(10)
if(last_sound < world.time + 1)
playsound(src, 'sound/machines/disposalflush.ogg', 50, 0, 0)
last_sound = world.time
- sleep(5) // wait for animation to finish
-
- H.init(src) // copy the contents of disposer to holder
- air_contents = new() // new empty gas resv.
-
- H.start(src) // start the holder processing movement
+ sleep(5)
+ H.init(src)
+ air_contents = new()
+ H.start(src)
flushing = 0
- // now reset disposal state
flush = 0
- if(mode == 2) // if was ready,
- mode = 1 // switch to charging
+ if(mode == 2)
+ mode = 1
update()
- return
+/obj/machinery/disposal/proc/newHolderDestination(obj/structure/disposalholder/H)
+ for(var/obj/item/smallDelivery/O in src)
+ H.tomail = 1
+ return
+
+/obj/machinery/disposal/proc/flushAnimation()
+ flick("[icon_state]-flush", src)
// called when area power changes
/obj/machinery/disposal/power_change()
@@ -490,6 +484,8 @@
//hasmob effects whether the package goes to cargo or its tagged destination.
for(var/mob/living/M in D)
if(M && M.stat != DEAD)
+ if(M.client)
+ M.client.eye = src
hasmob = 1
//Checks 1 contents level deep. This means that players can be sent through disposals...
@@ -498,6 +494,8 @@
if(O.contents)
for(var/mob/living/M in O.contents)
if(M && M.stat != DEAD)
+ if(M.client)
+ M.client.eye = src
hasmob = 1
// now everything inside the disposal gets put into the holder
@@ -542,8 +540,6 @@
active = 0
return
-
-
// find the turf which should contain the next pipe
/obj/structure/disposalholder/proc/nextloc()
return get_step(loc,dir)
@@ -590,7 +586,7 @@
return
/obj/structure/disposalholder/allow_drop()
- return 0
+ return 1
// Disposal pipes
@@ -979,7 +975,7 @@
sortType = O.currTag
playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1)
var/tag = uppertext(TAGGERLOCATIONS[O.currTag])
- user << " Changed filter to [tag]."
+ user << "Changed filter to [tag]."
updatedesc()
@@ -1327,4 +1323,4 @@
else
dirs = alldirs.Copy()
- src.streak(dirs)
+ src.streak(dirs)
\ No newline at end of file
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index de834c2d80f..f4495358aed 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -234,8 +234,6 @@
desc = "A chute for big and small packages alike!"
density = 1
icon_state = "intake"
-
- var/start_flush = 0
var/c_mode = 0
/obj/machinery/disposal/deliveryChute/New(loc,var/obj/structure/disposalconstruct/make_from)
@@ -287,40 +285,11 @@
/obj/mecha/disposalEnterTry()
return
-/obj/machinery/disposal/deliveryChute/flush()
- flushing = 1
+/obj/machinery/disposal/deliveryChute/flushAnimation()
flick("intake-closing", src)
- var/deliveryCheck = 0
- var/obj/structure/disposalholder/H = new() // virtual holder object which actually
- // travels through the pipes.
-/* for(var/obj/structure/bigDelivery/O in src)
- deliveryCheck = 1
- if(O.sortTag == 0) //This auto-sorts package wrapped objects to disposals
- O.sortTag = 1 //Cargo techs can do this themselves with their taggers
- for(var/obj/item/smallDelivery/O in src) //With this disabled packages will loop back round and come out the mail chute
- deliveryCheck = 1
- if(O.sortTag == 0)
- O.sortTag = 1 */
- if(deliveryCheck == 0)
- H.destinationTag = 1
- sleep(10)
- if((start_flush + 15) < world.time)
- start_flush = world.time
- playsound(src, 'sound/machines/disposalflush.ogg', 50, 0, 0)
- sleep(5) // wait for animation to finish
-
- H.init(src) // copy the contents of disposer to holder
- air_contents = new() // new empty gas resv.
-
- H.start(src) // start the holder processing movement
- flushing = 0
- // now reset disposal state
- flush = 0
- if(mode == 2) // if was ready,
- mode = 1 // switch to charging
- update()
- return
+/obj/machinery/disposal/deliveryChute/newHolderDestination(obj/structure/disposalholder/H)
+ H.destinationTag = 1
/obj/machinery/disposal/deliveryChute/attackby(var/obj/item/I, var/mob/user, params)
if(!I || !user)
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index ee333ef117b..91d498bd90f 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -111,7 +111,7 @@
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/chem_dispenser
category = list ("Medical Machinery")
-
+
/datum/design/chem_master
name = "Machine Design (Chem Master Board)"
desc = "The circuit board for a Chem Master 2999."
@@ -252,6 +252,76 @@
build_path = /obj/item/weapon/circuitboard/microwave
category = list ("Misc. Machinery")
+/datum/design/gibber
+ name = "Machine Design (Gibber Board)"
+ desc = "The circuit board for a gibber."
+ id = "gibber"
+ req_tech = list("programming" = 1)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/gibber
+ category = list ("Misc. Machinery")
+
+/datum/design/smartfridge
+ name = "Machine Design (Smartfridge Board)"
+ desc = "The circuit board for a smartfridge."
+ id = "smartfridge"
+ req_tech = list("programming" = 1)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/smartfridge
+ category = list ("Misc. Machinery")
+
+/datum/design/monkey_recycler
+ name = "Machine Design (Monkey Recycler Board)"
+ desc = "The circuit board for a monkey recycler."
+ id = "smartfridge"
+ req_tech = list("programming" = 1)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/monkey_recycler
+ category = list ("Misc. Machinery")
+
+/datum/design/seed_extractor
+ name = "Machine Design (Seed Extractor Board)"
+ desc = "The circuit board for a seed extractor."
+ id = "seed_extractor"
+ req_tech = list("programming" = 1)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/seed_extractor
+ category = list ("Misc. Machinery")
+
+/datum/design/processor
+ name = "Machine Design (Processor Board)"
+ desc = "The circuit board for a processor."
+ id = "processor"
+ req_tech = list("programming" = 1)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/processor
+ category = list ("Misc. Machinery")
+
+/datum/design/recycler
+ name = "Machine Design (Recycler Board)"
+ desc = "The circuit board for a recycler."
+ id = "recycler"
+ req_tech = list("programming" = 1)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/recycler
+ category = list ("Misc. Machinery")
+
+/datum/design/holopad
+ name = "Machine Design (AI Holopad Board)"
+ desc = "The circuit board for a holopad."
+ id = "holopad"
+ req_tech = list("programming" = 1)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/holopad
+ category = list ("Misc. Machinery")
+
/datum/design/autolathe
name = "Machine Design (Autolathe Board)"
desc = "The circuit board for an autolathe."
diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm
index ddf3ff047de..f9749c7267b 100644
--- a/code/modules/research/designs/power_designs.dm
+++ b/code/modules/research/designs/power_designs.dm
@@ -48,6 +48,19 @@
build_path = /obj/item/weapon/stock_parts/cell/hyper
category = list("Misc","Power Designs")
+/datum/design/bluespace_cell
+ name = "Bluespace Power Cell"
+ desc = "A power cell that holds 40000 units of energy."
+ id = "bluespace_cell"
+ req_tech = list("powerstorage" = 6, "materials" = 5)
+ reliability = 70
+ build_type = PROTOLATHE | MECHFAB
+ materials = list("$metal" = 800, "$gold" = 300, "$silver" = 300, "$glass" = 160, "$diamond" = 160)
+ construction_time=100
+ build_path = /obj/item/weapon/stock_parts/cell/bluespace
+ category = list("Misc","Power Designs")
+
+
/datum/design/light_replacer
name = "Light Replacer"
desc = "A device to automatically replace lights. Refill with working lightbulbs."
diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm
index 117722ecb4e..ccec5e20d26 100644
--- a/code/modules/research/designs/stock_parts_designs.dm
+++ b/code/modules/research/designs/stock_parts_designs.dm
@@ -9,10 +9,20 @@
req_tech = list("engineering" = 3,
"materials" = 3)
build_type = PROTOLATHE
- materials = list("$metal" = 15000, "$glass" = 5000) //hardcore
+ materials = list("$metal" = 10000, "$glass" = 5000) //hardcore
build_path = /obj/item/weapon/storage/part_replacer
category = list("Stock Parts")
+/datum/design/BS_RPED
+ name = "Bluespace RPED"
+ desc = "Powered by bluespace technology, this RPED variant can upgrade buildings from a distance, without needing to remove the panel first."
+ id = "bs_rped"
+ req_tech = list("engineering" = 3, "materials" = 5, "programming" = 3, "bluespace" = 3)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 15000, "$glass" = 5000, "$silver" = 2500) //hardcore
+ build_path = /obj/item/weapon/storage/part_replacer/bluespace
+ category = list("Stock Parts")
+
//Capacitors
/datum/design/basic_capacitor
name = "Basic Capacitor"
@@ -45,6 +55,17 @@
build_path = /obj/item/weapon/stock_parts/capacitor/super
category = list("Stock Parts")
+/datum/design/quadratic_capacitor
+ name = "Quadratic Capacitor"
+ desc = "A stock part used in the construction of various devices."
+ id = "quadratic_capacitor"
+ req_tech = list("powerstorage" = 6, "materials" = 5)
+ build_type = PROTOLATHE
+ reliability = 71
+ materials = list("$metal" = 100, "$glass" = 100, "$diamond" = 40)
+ build_path = /obj/item/weapon/stock_parts/capacitor/quadratic
+ category = list("Stock Parts")
+
//Scanning modules
/datum/design/basic_scanning
name = "Basic Scanning Module"
@@ -77,6 +98,17 @@
build_path = /obj/item/weapon/stock_parts/scanning_module/phasic
category = list("Stock Parts")
+/datum/design/triphasic_scanning
+ name = "Triphasic Scanning Module"
+ desc = "A stock part used in the construction of various devices."
+ id = "triphasic_scanning"
+ req_tech = list("magnets" = 6, "materials" = 4)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 100, "$glass" = 40, "$diamond" = 20)
+ reliability = 72
+ build_path = /obj/item/weapon/stock_parts/scanning_module/triphasic
+ category = list("Stock Parts")
+
//Maipulators
/datum/design/micro_mani
name = "Micro Manipulator"
@@ -109,6 +141,17 @@
build_path = /obj/item/weapon/stock_parts/manipulator/pico
category = list("Stock Parts")
+/datum/design/femto_mani
+ name = "Femto Manipulator"
+ desc = "A stock part used in the construction of various devices."
+ id = "femto_mani"
+ req_tech = list("materials" = 6, "programming" = 3)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 60, "$diamond" = 30)
+ reliability = 73
+ build_path = /obj/item/weapon/stock_parts/manipulator/femto
+ category = list("Stock Parts")
+
//Micro-lasers
/datum/design/basic_micro_laser
name = "Basic Micro-Laser"
@@ -141,6 +184,17 @@
build_path = /obj/item/weapon/stock_parts/micro_laser/ultra
category = list("Stock Parts")
+/datum/design/quadultra_micro_laser
+ name = "Quad-Ultra Micro-Laser"
+ desc = "A stock part used in the construction of various devices."
+ id = "quadultra_micro_laser"
+ req_tech = list("magnets" = 6, "materials" = 6)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 20, "$glass" = 40, "$uranium" = 20, "$diamond" = 20)
+ reliability = 70
+ build_path = /obj/item/weapon/stock_parts/micro_laser/quadultra
+ category = list("Stock Parts")
+
/datum/design/basic_matter_bin
name = "Basic Matter Bin"
desc = "A stock part used in the construction of various devices."
@@ -172,6 +226,17 @@
build_path = /obj/item/weapon/stock_parts/matter_bin/super
category = list("Stock Parts")
+/datum/design/bluespace_matter_bin
+ name = "Bluespace Matter Bin"
+ desc = "A stock part used in the construction of various devices."
+ id = "bluespace_matter_bin"
+ req_tech = list("materials" = 6)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 160, "$diamond" = 200)
+ reliability = 75
+ build_path = /obj/item/weapon/stock_parts/matter_bin/bluespace
+ category = list("Stock Parts")
+
//T-Comms devices
/datum/design/subspace_ansible
name = "Subspace Ansible"
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index b4b25eb9e42..6c584bc1a15 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -17,8 +17,9 @@ var/global/list/obj/machinery/message_server/message_servers = list()
var/recipient = "Unspecified" //name of the person
var/sender = "Unspecified" //name of the sender
var/message = "Blank" //transferred message
+ var/image/photo = null //Attached photo
-/datum/data_pda_msg/New(var/param_rec = "",var/param_sender = "",var/param_message = "")
+/datum/data_pda_msg/New(var/param_rec = "",var/param_sender = "",var/param_message = "",var/param_photo=null)
if(param_rec)
recipient = param_rec
@@ -26,6 +27,19 @@ var/global/list/obj/machinery/message_server/message_servers = list()
sender = param_sender
if(param_message)
message = param_message
+ if(param_photo)
+ photo = param_photo
+
+/datum/data_pda_msg/Topic(href,href_list)
+ ..()
+ if(href_list["photo"])
+ var/mob/M = usr
+ M << browse_rsc(photo, "pda_photo.png")
+ M << browse("PDA Photo" \
+ + "" \
+ + "" \
+ + "", "window=book;size=192x192")
+ onclose(M, "PDA Photo")
/datum/data_rc_msg
var/rec_dpt = "Unspecified" //name of the person
@@ -105,8 +119,9 @@ var/global/list/obj/machinery/message_server/message_servers = list()
/obj/machinery/message_server/proc/send_chat_message(var/sender = "", var/channel = "", var/message = "")
chat_msgs += new/datum/data_chat_msg(sender,channel,message)
-/obj/machinery/message_server/proc/send_pda_message(var/recipient = "",var/sender = "",var/message = "")
- pda_msgs += new/datum/data_pda_msg(recipient,sender,message)
+/obj/machinery/message_server/proc/send_pda_message(var/recipient = "",var/sender = "",var/message = "",var/photo=null)
+ . = new/datum/data_pda_msg(recipient,sender,message,photo)
+ pda_msgs += .
/obj/machinery/message_server/proc/send_rc_message(var/recipient = "",var/sender = "",var/message = "",var/stamp = "", var/id_auth = "", var/priority = 1)
rc_msgs += new/datum/data_rc_msg(recipient,sender,message,stamp,id_auth)
@@ -177,6 +192,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
/datum/feedback_variable/proc/add_details(var/text)
if (istext(text))
+ text = replacetext(text, " ", "_")
if (!details)
details = text
else
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index 9322e7c9286..b616d036397 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -145,7 +145,7 @@ Note: Must be placed west/left of and R&D console to function.
if (disabled)
return
if (!linked_console)
- user << " The [src.name] must be linked to an R&D console first!"
+ user << "The [src.name] must be linked to an R&D console first!"
return 1
if (busy)
user << "The [src.name] is busy! Please wait for completion of previous operation."
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index d076c813158..3182c0156d0 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -31,7 +31,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
/obj/machinery/computer/rdconsole
name = "R&D Console"
- icon_state = "rdcomp"
+ icon_screen = "rdcomp"
+ icon_keyboard = "rd_key"
circuit = /obj/item/weapon/circuitboard/rdconsole
var/datum/research/files //Stores all the collected research data.
var/obj/item/weapon/disk/tech_disk/t_disk = null //Stores the technology disk.
@@ -154,11 +155,11 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(istype(D, /obj/item/weapon/disk/tech_disk)) t_disk = D
else if (istype(D, /obj/item/weapon/disk/design_disk)) d_disk = D
else
- user << " Machine cannot accept disks in that format."
+ user << "Machine cannot accept disks in that format."
return
user.drop_item()
D.loc = src
- user << " You add the disk to the machine!"
+ user << "You add the disk to the machine!"
else
..()
src.updateUsrDialog()
@@ -168,7 +169,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(!emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
- user << " You disable the security protocols"
+ user << "You disable the security protocols"
/obj/machinery/computer/rdconsole/Topic(href, href_list)
if(..())
@@ -237,7 +238,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
else if(href_list["eject_item"]) //Eject the item inside the destructive analyzer.
if(linked_destroy)
if(linked_destroy.busy)
- usr << " The destructive analyzer is busy at the moment."
+ usr << "The destructive analyzer is busy at the moment."
else if(linked_destroy.loaded_item)
linked_destroy.loaded_item.loc = linked_destroy.loc
@@ -248,7 +249,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
else if(href_list["deconstruct"]) //Deconstruct the item in the destructive analyzer and update the research holder.
if(linked_destroy)
if(linked_destroy.busy)
- usr << " The destructive analyzer is busy at the moment."
+ usr << "The destructive analyzer is busy at the moment."
else
var/choice = input("Proceeding will destroy loaded item.") in list("Proceed", "Cancel")
if(choice == "Cancel" || !linked_destroy) return
@@ -261,7 +262,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
linked_destroy.busy = 0
if(!linked_destroy.hacked)
if(!linked_destroy.loaded_item)
- usr <<" The destructive analyzer appears to be empty."
+ usr <<"The destructive analyzer appears to be empty."
screen = 1.0
return
if((linked_destroy.loaded_item.reliability >= 99 - (linked_destroy.decon_mod * 3)) || linked_destroy.loaded_item.crit_fail)
@@ -276,6 +277,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(linked_lathe) //Also sends salvaged materials to a linked protolathe, if any.
linked_lathe.m_amount += min((linked_lathe.max_material_storage - linked_lathe.TotalMaterials()), (linked_destroy.loaded_item.m_amt*(linked_destroy.decon_mod/10)))
linked_lathe.g_amount += min((linked_lathe.max_material_storage - linked_lathe.TotalMaterials()), (linked_destroy.loaded_item.g_amt*(linked_destroy.decon_mod/10)))
+ feedback_add_details("item_deconstructed","[linked_destroy.loaded_item.name]")
linked_destroy.loaded_item = null
else
screen = 1.0
@@ -306,7 +308,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
else if(href_list["sync"]) //Sync the research holder with all the R&D consoles in the game that aren't sync protected.
screen = 0.0
if(!sync)
- usr << " You must connect to the network first!"
+ usr << "You must connect to the network first!"
else
griefProtection() //Putting this here because I dont trust the sync process
spawn(30)
@@ -406,6 +408,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
var/R = being_built.reliability
spawn(32*amount/coeff)
if(g2g) //And if we only fail the material requirements, we still spend time and power
+ var/already_logged = 0
for(var/i = 0, i\
+ \
+ \
+ \
+ \
+ \
"
dat += list_categories(linked_lathe.categories, 3.15)
@@ -957,12 +964,12 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "Material Amount: [linked_imprinter.TotalMaterials()] "
dat += "Chemical Volume: [linked_imprinter.reagents.total_volume]"
- dat += ""
dat += list_categories(linked_imprinter.categories, 4.15)
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 62dd6e45bac..fb56e869fe8 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -177,7 +177,8 @@
/obj/machinery/computer/rdservercontrol
name = "R&D Server Controller"
desc = "Used to manage access to research and manufacturing databases."
- icon_state = "rdcomp"
+ icon_screen = "rdcomp"
+ icon_keyboard = "rd_key"
var/screen = 0
var/obj/machinery/r_n_d/server/temp_server
var/list/servers = list()
@@ -192,7 +193,7 @@
add_fingerprint(usr)
usr.set_machine(src)
if(!src.allowed(usr) && !emagged)
- usr << " You do not have the required access level."
+ usr << "You do not have the required access level."
return
if(href_list["main"])
@@ -269,7 +270,7 @@
if(istype(S, /obj/machinery/r_n_d/server/centcom) && !badmin)
continue
dat += "[S.name] || "
- dat += " Access Rights | "
+ dat += "Access Rights | "
dat += "Data Management"
if(badmin) dat += " | Server-to-Server Transfer"
dat += " "
@@ -310,7 +311,7 @@
dat += "[temp_server.name] Server to Server Transfer
"
dat += "Send Data to what server? "
for(var/obj/machinery/r_n_d/server/S in servers)
- dat += "[S.name] (Transfer) "
+ dat += "[S.name] (Transfer) "
dat += "Main Menu"
user << browse("R&D Server Control[dat]", "window=server_control;size=575x400")
onclose(user, "server_control")
@@ -325,7 +326,7 @@
if(!emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
- user << " You you disable the security protocols."
+ user << "You you disable the security protocols."
/obj/machinery/r_n_d/server/robotics
name = "Robotics R&D Server"
diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm
index e522d1fc166..4f67a8aa16d 100644
--- a/code/modules/research/stock_parts.dm
+++ b/code/modules/research/stock_parts.dm
@@ -14,10 +14,41 @@
display_contents_with_number = 1
max_w_class = 3
max_combined_w_class = 100
+ var/works_from_distance = 0
+ var/pshoom_or_beepboopblorpzingshadashwoosh = 'sound/items/rped.ogg'
+ var/alt_sound = null
+
+/obj/item/weapon/storage/part_replacer/afterattack(obj/machinery/T as obj, mob/living/carbon/human/user as mob, flag, params)
+ if(flag)
+ return
+ else
+ if(works_from_distance)
+ if(istype(T))
+ if(T.component_parts)
+ T.exchange_parts(user, src)
+ user.Beam(T,icon_state="rped_upgrade",icon='icons/effects/effects.dmi',time=5)
+ return
+
+/obj/item/weapon/storage/part_replacer/bluespace
+ name = "bluespace rapid part exchange device"
+ desc = "A version of the RPED that allows for replacement of parts and scanning from a distance, along with higher capacity for parts."
+ icon_state = "BS_RPED"
+ item_state = "BS_RPED"
+ w_class = 3
+ storage_slots = 400
+ max_w_class = 3
+ max_combined_w_class = 800
+ works_from_distance = 1
+ pshoom_or_beepboopblorpzingshadashwoosh = 'sound/items/PSHOOM.ogg'
+ alt_sound = 'sound/items/PSHOOM_2.ogg'
+
/obj/item/weapon/storage/part_replacer/proc/play_rped_sound()
//Plays the sound for RPED exhanging or installing parts.
- playsound(src, 'sound/items/rped.ogg', 40, 1)
+ if(alt_sound && prob(1))
+ playsound(src, alt_sound, 40, 1)
+ else
+ playsound(src, pshoom_or_beepboopblorpzingshadashwoosh, 40, 1)
//Sorts stock parts inside an RPED by their rating.
//Only use /obj/item/weapon/stock_parts/ with this sort proc!
@@ -172,6 +203,51 @@
rating = 3
m_amt = 80
+//Rating 4
+
+/obj/item/weapon/stock_parts/capacitor/quadratic
+ name = "quadratic capacitor"
+ desc = "An capacity capacitor used in the construction of a variety of devices."
+ icon_state = "quadratic_capacitor"
+ origin_tech = "powerstorage=6;materials=5"
+ rating = 4
+ m_amt = 50
+ g_amt = 50
+
+/obj/item/weapon/stock_parts/scanning_module/triphasic
+ name = "triphasic scanning module"
+ desc = "A compact, ultra resolution triphasic scanning module used in the construction of certain devices."
+ icon_state = "triphasic_scan_module"
+ origin_tech = "magnets=6"
+ rating = 4
+ m_amt = 50
+ g_amt = 20
+
+/obj/item/weapon/stock_parts/manipulator/femto
+ name = "femto-manipulator"
+ desc = "A tiny little manipulator used in the construction of certain devices."
+ icon_state = "femto_mani"
+ origin_tech = "materials=6;programming=3"
+ rating = 4
+ m_amt = 30
+
+/obj/item/weapon/stock_parts/micro_laser/quadultra
+ name = "quad-ultra micro-laser"
+ icon_state = "quadultra_micro_laser"
+ desc = "A tiny laser used in certain devices."
+ origin_tech = "magnets=6"
+ rating = 4
+ m_amt = 10
+ g_amt = 20
+
+/obj/item/weapon/stock_parts/matter_bin/bluespace
+ name = "bluespace matter bin"
+ desc = "A container for hold compressed matter awaiting re-construction."
+ icon_state = "bluespace_matter_bin"
+ origin_tech = "materials=6"
+ rating = 4
+ m_amt = 80
+
// Subspace stock parts
/obj/item/weapon/stock_parts/subspace/ansible
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index f6693492790..fd4c133308f 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -18,10 +18,10 @@
/obj/item/slime_extract/attackby(obj/item/O as obj, mob/user as mob)
if(istype(O, /obj/item/weapon/slimesteroid2))
if(enhanced == 1)
- user << " This extract has already been enhanced!"
+ user << "This extract has already been enhanced!"
return ..()
if(Uses == 0)
- user << " You can't enhance a used extract!"
+ user << "You can't enhance a used extract!"
return ..()
user <<"You apply the enhancer. It now has triple the amount of uses."
Uses = 3
@@ -138,8 +138,8 @@
M.docile = 1
M.nutrition = 700
- M <<" You absorb the potion and feel your intense desire to feed melt away."
- user <<" You feed the slime the potion, removing it's hunger and calming it."
+ M <<"You absorb the potion and feel your intense desire to feed melt away."
+ user <<"You feed the slime the potion, removing it's hunger and calming it."
var/newname = copytext(sanitize(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text),1,MAX_NAME_LEN)
if (!newname)
@@ -220,16 +220,16 @@
/obj/item/weapon/slimesteroid/attack(mob/living/simple_animal/slime/M as mob, mob/user as mob)
if(!isslime(M))//If target is not a slime.
- user << " The steroid only works on baby slimes!"
+ user << "The steroid only works on baby slimes!"
return ..()
if(M.is_adult) //Can't tame adults
- user << " Only baby slimes can use the steroid!"
+ user << "Only baby slimes can use the steroid!"
return..()
if(M.stat)
- user << " The slime is dead!"
+ user << "The slime is dead!"
return..()
if(M.cores == 3)
- user <<" The slime already has the maximum amount of extract!"
+ user <<"The slime already has the maximum amount of extract!"
return..()
user <<"You feed the slime the steroid. It now has triple the amount of extract."
@@ -252,10 +252,10 @@
/*afterattack(obj/target, mob/user , flag)
if(istype(target, /obj/item/slime_extract))
if(target.enhanced == 1)
- user << " This extract has already been enhanced!"
+ user << "This extract has already been enhanced!"
return ..()
if(target.Uses == 0)
- user << " You can't enhance a used extract!"
+ user << "You can't enhance a used extract!"
return ..()
user <<"You apply the enhancer. It now has triple the amount of uses."
target.Uses = 3
@@ -271,13 +271,13 @@
/obj/item/weapon/slimestabilizer/attack(mob/living/simple_animal/slime/M as mob, mob/user as mob)
if(!isslime(M))
- user << " The stabilizer only works on slimes!"
+ user << "The stabilizer only works on slimes!"
return ..()
if(M.stat)
- user << " The slime is dead!"
+ user << "The slime is dead!"
return..()
if(M.mutation_chance == 0)
- user <<" The slime already has no chance of mutating!"
+ user <<"The slime already has no chance of mutating!"
return..()
user <<"You feed the slime the stabilizer. It is now less likely to mutate."
@@ -292,16 +292,16 @@
/obj/item/weapon/slimemutator/attack(mob/living/simple_animal/slime/M as mob, mob/user as mob)
if(!isslime(M))
- user << " The mutator only works on slimes!"
+ user << "The mutator only works on slimes!"
return ..()
if(M.stat)
- user << " The slime is dead!"
+ user << "The slime is dead!"
return..()
if(M.mutator_used)
- user << " This slime has already consumed a mutator, any more would be far too unstable!"
+ user << "This slime has already consumed a mutator, any more would be far too unstable!"
return..()
if(M.mutation_chance == 100)
- user <<" The slime is already guaranteed to mutate!"
+ user <<"The slime is already guaranteed to mutate!"
return..()
user <<"You feed the slime the mutator. It is now more likely to mutate."
@@ -418,3 +418,57 @@
G.key = ghost.key
G << "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost."
qdel(src)
+
+
+
+
+/obj/effect/timestop
+ anchored = 1
+ name = "chronofield"
+ desc = "ZA WARUDO"
+ icon = 'icons/effects/160x160.dmi'
+ icon_state = "time"
+ layer = FLY_LAYER
+ pixel_x = -64
+ pixel_y = -64
+ unacidable = 1
+ var/mob/living/immune = null // the one who creates the timestop is immune
+ var/freezerange = 2
+ var/duration = 140
+ alpha = 125
+
+/obj/effect/timestop/New()
+ ..()
+ timestop()
+
+
+/obj/effect/timestop/proc/timestop()
+ playsound(get_turf(src), 'sound/magic/TIMEPARADOX2.ogg', 100, 1, -1)
+ while(loc)
+ if(duration)
+ for(var/mob/living/M in orange (freezerange, src.loc))
+ if(M == immune)
+ continue
+ M.stunned = 10
+ M.anchored = 1
+ if(istype(M, /mob/living/simple_animal/hostile))
+ var/mob/living/simple_animal/hostile/H = M
+ H.AIStatus = AI_OFF
+ H.LoseTarget()
+ continue
+ for(var/obj/item/projectile/P in orange (freezerange, src.loc))
+ P.paused = TRUE
+ duration --
+ else
+ for(var/mob/living/M in orange (freezerange+2, src.loc)) //longer range incase they lag out of it or something
+ M.stunned = 0
+ M.anchored = 0
+ if(istype(M, /mob/living/simple_animal/hostile))
+ var/mob/living/simple_animal/hostile/H = M
+ H.AIStatus = initial(H.AIStatus)
+ continue
+ for(var/obj/item/projectile/P in orange(freezerange+2, src.loc))
+ P.paused = FALSE
+ qdel(src)
+ return
+ sleep(1)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 1d107132a08..db7b923c0f5 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -56,7 +56,7 @@
//returns turfs within our projected rectangle in a specific order.
//this ensures that turfs are copied over in the same order, regardless of any rotation
-/obj/docking_port/proc/return_ordered_turfs(_x, _y, _z, _dir)
+/obj/docking_port/proc/return_ordered_turfs(_x, _y, _z, _dir, area/A)
if(!_dir)
_dir = dir
if(!_x)
@@ -86,7 +86,14 @@
for(var/dy=0, dy You fried the consoles ID checking system."
+ user << "You fried the consoles ID checking system."
/obj/machinery/computer/shuttle/ferry
name = "transport ferry console"
diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm
index 63327f69d70..662a4304d3e 100644
--- a/code/modules/surgery/helpers.dm
+++ b/code/modules/surgery/helpers.dm
@@ -48,6 +48,7 @@
user.visible_message("[user] drapes [I] over [M]'s [parse_zone(procedure.location)] to prepare for \an [procedure.name].", "You drape [I] over [M]'s [parse_zone(procedure.location)] to prepare for \an [procedure.name].")
add_logs(user, M, "operated", addition="Operation type: [procedure.name]")
+ feedback_add_details("surgery_initiated","[procedure.name]")
return 1
else
user << "You need to expose [M]'s [procedure.location] first!"
diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm
index df88239994d..2025f3c155b 100644
--- a/code/modules/surgery/organs/organ.dm
+++ b/code/modules/surgery/organs/organ.dm
@@ -188,4 +188,12 @@
for(var/obj/item/organ/limb/L in organs)
for(var/obj/item/I in L.embedded_objects)
L.embedded_objects -= I
- I.loc = T
\ No newline at end of file
+ I.loc = T
+
+ clear_alert("embeddedobject")
+
+/mob/living/carbon/human/proc/has_embedded_objects()
+ . = 0
+ for(var/obj/item/organ/limb/L in organs)
+ for(var/obj/item/I in L.embedded_objects)
+ return 1
\ No newline at end of file
diff --git a/code/modules/surgery/remove_embedded_object.dm b/code/modules/surgery/remove_embedded_object.dm
index 33968dd8968..f8e7de333d9 100644
--- a/code/modules/surgery/remove_embedded_object.dm
+++ b/code/modules/surgery/remove_embedded_object.dm
@@ -33,6 +33,9 @@
I.loc = get_turf(H)
L.embedded_objects -= I
+ if(!H.has_embedded_objects())
+ H.clear_alert("embeddedobject")
+
if(objects > 0)
user.visible_message("[user] sucessfully removes [objects] objects from [H]'s [L.getDisplayName()]!", "You sucessfully remove [objects] objects from [H]'s [L.getDisplayName()].")
else
diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm
index 042832894d7..76365b0790c 100644
--- a/code/modules/surgery/surgery_step.dm
+++ b/code/modules/surgery/surgery_step.dm
@@ -73,6 +73,7 @@
/datum/surgery_step/proc/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("[user] succeeds!", "You succeed.")
+ feedback_add_details("surgery_step_success","[src.type]")
return 1
/datum/surgery_step/saw/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -80,10 +81,12 @@
var/mob/living/carbon/human/H = target
H.apply_damage(75,"brute","[target_zone]")
user.visible_message("[user] saws [target]'s [parse_zone(target_zone)] open!", "You saw [target]'s [parse_zone(target_zone)] open.")
+ feedback_add_details("surgery_step_success","[src.type]")
return 1
/datum/surgery_step/proc/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("[user] screws up!", "You screw up!")
+ feedback_add_details("surgery_step_failed","[src.type]")
return 0
/datum/surgery_step/close/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm
index 7949dcfba88..e1f4a37d288 100644
--- a/code/modules/telesci/telepad.dm
+++ b/code/modules/telesci/telepad.dm
@@ -35,7 +35,7 @@
if(istype(I, /obj/item/device/multitool))
var/obj/item/device/multitool/M = I
M.buffer = src
- user << "You save the data in the [I.name]'s buffer."
+ user << "You save the data in the [I.name]'s buffer."
if(exchange_parts(user, I))
return
@@ -60,22 +60,22 @@
playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
if(anchored)
anchored = 0
- user << " \The [src] can now be moved."
+ user << "\The [src] can now be moved."
else if(!anchored)
anchored = 1
- user << " \The [src] is now secured."
+ user << "\The [src] is now secured."
if(istype(W, /obj/item/weapon/screwdriver))
if(stage == 0)
playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
- user << " You unscrew the telepad's tracking beacon."
+ user << "You unscrew the telepad's tracking beacon."
stage = 1
else if(stage == 1)
playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
- user << " You screw in the telepad's tracking beacon."
+ user << "You screw in the telepad's tracking beacon."
stage = 0
if(istype(W, /obj/item/weapon/weldingtool) && stage == 1)
playsound(src, 'sound/items/Welder.ogg', 50, 1)
- user << " You disassemble the telepad."
+ user << "You disassemble the telepad."
new /obj/item/stack/sheet/metal(get_turf(src))
new /obj/item/stack/sheet/glass(get_turf(src))
qdel(src)
@@ -91,7 +91,7 @@
/obj/item/device/telepad_beacon/attack_self(mob/user as mob)
if(user)
- user << " Locked In"
+ user << "Locked In"
new /obj/machinery/telepad_cargo(user.loc)
playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
qdel(src)
@@ -142,11 +142,11 @@
if(mode == 0)
mode = 1
playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
- user << " The telepad locator has become uncalibrated."
+ user << "The telepad locator has become uncalibrated."
else
mode = 0
playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
- user << " You calibrate the telepad locator."
+ user << "You calibrate the telepad locator."
/obj/item/weapon/rcs/emag_act(mob/user as mob)
if(!emagged)
@@ -154,4 +154,4 @@
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(5, 1, src)
s.start()
- user << " You emag the RCS. Click on it to toggle between modes."
+ user << "You emag the RCS. Click on it to toggle between modes."
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index 6d602467fa1..aa0343a1641 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -74,7 +74,7 @@
if(M.buffer && istype(M.buffer, /obj/machinery/telepad))
telepad = M.buffer
M.buffer = null
- user << "You upload the data from the [W.name]'s buffer."
+ user << "You upload the data from the [W.name]'s buffer."
else
..()
diff --git a/code/orphaned procs/priority_announce.dm b/code/orphaned procs/priority_announce.dm
index e085fa783ca..3630b9d58df 100644
--- a/code/orphaned procs/priority_announce.dm
+++ b/code/orphaned procs/priority_announce.dm
@@ -6,7 +6,8 @@
if(type == "Priority")
announcement += "
"
news_network.SubmitArticle(text, "Captain's Announcement", "Station Announcements", null)
diff --git a/config/game_options.txt b/config/game_options.txt
index cc2a9c13d1d..9c62544f085 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -276,3 +276,22 @@ MIDROUND_ANTAG_LIFE_CHECK 0.7
#NO_SUMMON_MAGIC
#NO_SUMMON_EVENTS
+//Comment for "normal" explosions, which ignore obstacles
+//Uncomment for explosions that react to doors and walls
+REACTIONARY_EXPLOSIONS
+
+### Configure the bomb cap
+## This caps all explosions to the specified range. Used for both balance reasons and to prevent overloading the server and lagging the game out.
+## This is given as the 3rd number(light damage) in the standard (1,2,3) explosion notation. The other numbers are derived by dividing by 2 and 4.
+## eg: If you give the number 20. The bomb cap will be 5,10,20.
+## Can be any number between 4 and 128, some examples are provided below.
+
+## Default (3,7,14)
+BOMBCAP 14
+## One 'step' up (4,8,16) (recommended if you enable REACTIONARY_EXPLOSIONS above)
+#BOMBCAP 16
+## LagHell (7,14,28)
+#BOMBCAP 28
+
+
+
diff --git a/config/tips.txt b/config/tips.txt
index dd6b2f23f85..04ea4ab50d0 100644
--- a/config/tips.txt
+++ b/config/tips.txt
@@ -85,3 +85,6 @@ You can use . or # instead of : for radio channels. Building this habit reduces
While pulling something, clicking on a tile with an empty hand will move it to that tile. No more getting stuck in maint while dragging something!
Things that override clicks like decks of cards or paper bins can still be picked up by dragging them to your character. Equipped things that override click can be unequipped by dragging it to an empty hand.
In the job selection menu, from the lobby, you can use right click on the "Low/Medium/High" priority button to make it cycle backwards.
+If you stay out of camera range for 10 seconds, the AI's track on you will break.
+You can shoot cameras with bullets to disable them remotely.
+Disabling a camera with wirecutters will not cause a camera alarm, but bludgeoning it will.
diff --git a/html/changelog.html b/html/changelog.html
index ba63933790f..6845a7e00f6 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,185 @@
-->
+
15 June 2015
+
Incoming5643 updated:
+
+
Lizards can now choose from a wide varity of physical appearances in character creation! Sprites made by WJohn. Hiss Responsibly.
+
+
Kor updated:
+
+
A terrible new creature stalks the halls of SS13.
+
The wizard has a new artefact related to said creature.
+
Added a new sepia slime plasma reaction. Try it out!
+
+
spasticVerbalizer updated:
+
+
Drones can now properly quick-equip.
+
+
+
14 June 2015
+
Ikarrus updated:
+
+
White suits added to gang outfits
+
Gang outfits are now free, but are now limited in stock (that replenishes over time)
+
While attempting a Hostile Takeover, gangs do not gain influence. Instead, the takeover timer will be reduced by how many territories they control.
+
Spraycan cost reduced to 5 influence.
+
Recruitment Pen cooldown increased to 2 minutes, but is reduced if the enemy gang has more members than yours.
+
Tommy guns no longer deal stamina damage.
+
Gangtools can no longer recall the shuttle if the game mode is not Gang War
+
+
+
12 June 2015
+
Ikarrus updated:
+
+
Gang Updates
+
New objective: To win, Gangs must now buy a Dominator machine (50 influence) and defend it for a varying time frame. * The location of the dominator is broadcasted to the entire station the moment it is activated * The more territories the gang controls, the less time it will take * Gangs no longer win by capturing territories
+
A choice of gang outfits are now purchasable for 1 influence each
+
Thompson SMGs aka "tommy guns" are now purchasable for 50 influence
+
Bulletproof armor vests are now purchasable for 10 influence
+
Gang messages are now free to send
+
Prices of pistols and pens reduced to 20 and 30, respectively
+
Gang spraycans have been made a lot less obvious. They look nearly identical to regular ones, now.
+
Gangs will no longer be notified how much territory the enemy controls
+
+
Incoming5643 updated:
+
+
Growing tired of reports of slain members, the Wizard Federation has cautiously sactioned the dark path of lichdom. Beware of the powerful lich who hides his phylactery well, for he is immortal!
+
The trick to defeating liches is to destroy either their body or their phylactery item before they can ressurect to it. The more a lich is slain the longer it will take him to make use of his phylactery and the more likely the crew is to catch him during a vunerable moment.
+
Due to the addition of proper liching, skeletons as a choosable race from magic mirrors has been discontinued. My apologies to the powergamers. A special admin version of the mirror that allows for skeletons has also been added to the code.
+
+
Miauw updated:
+
+
AIs have received several minor nerfs in order to increase antagonist counterplay:
+
AI tracking is no longer instant, it takes an amount of time that increases with distance from the AI eye, up to 4 seconds. The AI detector item will light up when an AI begins tracking.
+
A random camera failure event has been added, which will break one or two random cameras.
+
You can no longer keep tracking people that are outside of your camera vision.
+
Camera wires have been removed. Screwdriver a camera to open the panel, then use wirecutters to disable it or a multitool to change the focus.
+
You can now hit cameras with items to break them. To repair a camera, simply open the panel and use wirecutters on it.
+
Camera alerts now only happen after a camera is reactivated.
+
+
RemieRichards updated:
+
+
New optional explosion effect ported from /vg/'s DeityLink, Explosions that are affected by Walls and Doors
+
+
+
11 June 2015
+
Cheridan updated:
+
+
Removes the powerdrain for individiual active modules on cyborgs.
+
+
+
09 June 2015
+
Aranclanos updated:
+
+
Structures and machines can now be built on shuttles.
+
+
Iamgoofball updated:
+
+
Adds the Bluespace Rapid Part Exchange Device: holds up to 400 stock parts and can be used to upgrade machines at range without needing to open their maintenance panel.
+
A new tier of stock parts have been added, they're very expensive to produce but provide ample improvements.
+
Many machines can now also be upgraded.
+
Emitter: Lasers decrease firing delay and Capacitors decrease power consumption.
+
Gibber: Matter Bins increase yield of meat and Manipulators speed up operation time, at high level can gib creatures with clothes.
Monkey Recycler: Matter Bins increase the amount of monkey cubes produced and Manipulators reduce the monkey-to-cubes ratio to a minimum of 1-to-1.
+
Crusher: Matter Bins increase material yield and Manipulators increase chance to yield materials, at high level there is a chance for rarer materials.
+
Holopad: Capacitors increase an AI's traversal range from the holopad.
+
Smartfridge: Matter Bins increase storage.
+
Processor: Matter Bins increase yield and Manipulators speed up operation time.
+
Microwave: Matter Bins increase storage.
+
Ore Redemption Machine: Matter Bins increase yield per ore, Lasers increase points per ore and Manipulators speed up operation time.
+
Hydroponics Tray: Manipulators improve water and nutrients efficiency.
+
Biogenerator: Matter Bins increase storage.
+
+
bananacreampie updated:
+
+
Added several new options to the ghostform sprites
+
+
+
08 June 2015
+
AnturK updated:
+
+
Improved the interface of Spellbooks.
+
+
Cheridan updated:
+
+
Push-force from Atmospherics now depends on an entity's weight, heavier objects are less prone to being pushed.
+
Magboots and No-Slip shoes now prevent pushing from spacewind.
+
+
Firecage updated:
+
+
Protolathes can now build Experimental Welding Tools.
+
+
+
07 June 2015
+
Aranclanos updated:
+
+
Malfunctioning AIs can preview placement of a Robotic Factory.
+
+
Iamgoofball updated:
+
+
Bicardine, Dexalin, Kelotane, Anti-toxin, Inaprovaline and Tricordrazine have been re-added.
+
+
RemieRichards updated:
+
+
Lizards can now wag their tails, emote *wag to start and *stopwag to stop.
+
+
kingofkosmos updated:
+
+
Mops can now be wet from normal buckets and sinks.
+
+
+
06 June 2015
+
Incoming5643 updated:
+
+
Antagonists with escape alone can now escape with others on the shuttle, so long as they are also antagonists.
+
Antagonists with escape alone can also win if non-antagonists are on the shuttle provided they are locked in the brig.
+
Escaping to syndicate space on board the nuke op shuttle is now a valid way to escape the station.
+
+
Jordie0608 updated:
+
+
Admin-delaying the round now works once it has finished.
+
+
+
05 June 2015
+
CandyClown updated:
+
+
Ointments, bruise packs, and gauze are now stacked to 6 instead of 5.
+
+
CorruptComputer updated:
+
+
Security lockers no longer spawn in front of each other on Box.
+
Hooked up the scrubbers in QM's office on Box.
+
Fixed bar disposals on Box
+
Fixed the stacked heater+freezer in expirementor maint on Box
+
Made the turbine into Atmos and Engineering access only, and renamed the doors to Turbine on Box.
+
+
Ikarrus updated:
+
+
Gang Bosses will now be able to discreetly send messages to everyone in their gang for 5 influence a message.
+
Conversion pens now use a flat 60sec cooldown rate.
+
+
KorPhaeron updated:
+
+
You can now lay tiles on the asteroid. Go nuts building forts.
+
+
+
04 June 2015
+
Cuboos updated:
+
+
Added casting and firing sounds for wizard spells and staves.
+
A new title theme has been added.
+
+
Gun Hog updated:
+
+
Nanotrasen has approved the designs for destination taggers and hand labelers in the autolathe.
+
+
Palpatine213 updated:
+
+
Allows sechuds to have their id locks removed via emag as well as EMP
+
+
31 May 2015
duncathan updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a030bf17dca..a366f49f229 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2618,3 +2618,159 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
2015-05-31:
duncathan:
- tweak: Clarified the ability to retract changeling armblades.
+2015-06-04:
+ Cuboos:
+ - rscadd: Added casting and firing sounds for wizard spells and staves.
+ - rscadd: A new title theme has been added.
+ Gun Hog:
+ - rscadd: Nanotrasen has approved the designs for destination taggers and hand labelers
+ in the autolathe.
+ Palpatine213:
+ - tweak: Allows sechuds to have their id locks removed via emag as well as EMP
+2015-06-05:
+ CandyClown:
+ - tweak: Ointments, bruise packs, and gauze are now stacked to 6 instead of 5.
+ CorruptComputer:
+ - bugfix: Security lockers no longer spawn in front of each other on Box.
+ - bugfix: Hooked up the scrubbers in QM's office on Box.
+ - bugfix: Fixed bar disposals on Box
+ - bugfix: Fixed the stacked heater+freezer in expirementor maint on Box
+ - tweak: Made the turbine into Atmos and Engineering access only, and renamed the
+ doors to Turbine on Box.
+ Ikarrus:
+ - rscadd: Gang Bosses will now be able to discreetly send messages to everyone in
+ their gang for 5 influence a message.
+ - tweak: Conversion pens now use a flat 60sec cooldown rate.
+ KorPhaeron:
+ - rscadd: You can now lay tiles on the asteroid. Go nuts building forts.
+2015-06-06:
+ Incoming5643:
+ - rscadd: Antagonists with escape alone can now escape with others on the shuttle,
+ so long as they are also antagonists.
+ - rscadd: Antagonists with escape alone can also win if non-antagonists are on the
+ shuttle provided they are locked in the brig.
+ - rscadd: Escaping to syndicate space on board the nuke op shuttle is now a valid
+ way to escape the station.
+ Jordie0608:
+ - rscadd: Admin-delaying the round now works once it has finished.
+2015-06-07:
+ Aranclanos:
+ - rscadd: Malfunctioning AIs can preview placement of a Robotic Factory.
+ Iamgoofball:
+ - rscadd: Bicardine, Dexalin, Kelotane, Anti-toxin, Inaprovaline and Tricordrazine
+ have been re-added.
+ RemieRichards:
+ - rscadd: Lizards can now wag their tails, emote *wag to start and *stopwag to stop.
+ kingofkosmos:
+ - tweak: Mops can now be wet from normal buckets and sinks.
+2015-06-08:
+ AnturK:
+ - imageadd: Improved the interface of Spellbooks.
+ Cheridan:
+ - tweak: Push-force from Atmospherics now depends on an entity's weight, heavier
+ objects are less prone to being pushed.
+ - rscadd: Magboots and No-Slip shoes now prevent pushing from spacewind.
+ Firecage:
+ - rscadd: Protolathes can now build Experimental Welding Tools.
+2015-06-09:
+ Aranclanos:
+ - wip: Structures and machines can now be built on shuttles.
+ Iamgoofball:
+ - rscadd: 'Adds the Bluespace Rapid Part Exchange Device: holds up to 400 stock
+ parts and can be used to upgrade machines at range without needing to open their
+ maintenance panel.'
+ - rscadd: A new tier of stock parts have been added, they're very expensive to produce
+ but provide ample improvements.
+ - experiment: Many machines can now also be upgraded.
+ - tweak: 'Emitter: Lasers decrease firing delay and Capacitors decrease power consumption.'
+ - tweak: 'Gibber: Matter Bins increase yield of meat and Manipulators speed up operation
+ time, at high level can gib creatures with clothes.'
+ - tweak: 'Seed Extractor: Matter Bins increase storage and Manipulators multiply
+ seed production.'
+ - tweak: 'Monkey Recycler: Matter Bins increase the amount of monkey cubes produced
+ and Manipulators reduce the monkey-to-cubes ratio to a minimum of 1-to-1.'
+ - tweak: 'Crusher: Matter Bins increase material yield and Manipulators increase
+ chance to yield materials, at high level there is a chance for rarer materials.'
+ - tweak: 'Holopad: Capacitors increase an AI''s traversal range from the holopad.'
+ - tweak: 'Smartfridge: Matter Bins increase storage.'
+ - tweak: 'Processor: Matter Bins increase yield and Manipulators speed up operation
+ time.'
+ - tweak: 'Microwave: Matter Bins increase storage.'
+ - tweak: 'Ore Redemption Machine: Matter Bins increase yield per ore, Lasers increase
+ points per ore and Manipulators speed up operation time.'
+ - tweak: 'Hydroponics Tray: Manipulators improve water and nutrients efficiency.'
+ - tweak: 'Biogenerator: Matter Bins increase storage.'
+ bananacreampie:
+ - rscadd: Added several new options to the ghostform sprites
+2015-06-11:
+ Cheridan:
+ - rscdel: Removes the powerdrain for individiual active modules on cyborgs.
+2015-06-12:
+ Ikarrus:
+ - experiment: Gang Updates
+ - rscadd: 'New objective: To win, Gangs must now buy a Dominator machine (50 influence)
+ and defend it for a varying time frame. * The location of the dominator is
+ broadcasted to the entire station the moment it is activated * The more territories
+ the gang controls, the less time it will take * Gangs no longer win by capturing
+ territories'
+ - rscadd: A choice of gang outfits are now purchasable for 1 influence each
+ - rscadd: Thompson SMGs aka "tommy guns" are now purchasable for 50 influence
+ - rscadd: Bulletproof armor vests are now purchasable for 10 influence
+ - tweak: Gang messages are now free to send
+ - tweak: Prices of pistols and pens reduced to 20 and 30, respectively
+ - tweak: Gang spraycans have been made a lot less obvious. They look nearly identical
+ to regular ones, now.
+ - rscdel: Gangs will no longer be notified how much territory the enemy controls
+ Incoming5643:
+ - rscadd: Growing tired of reports of slain members, the Wizard Federation has cautiously
+ sactioned the dark path of lichdom. Beware of the powerful lich who hides his
+ phylactery well, for he is immortal!
+ - rscadd: The trick to defeating liches is to destroy either their body or their
+ phylactery item before they can ressurect to it. The more a lich is slain the
+ longer it will take him to make use of his phylactery and the more likely the
+ crew is to catch him during a vunerable moment.
+ - rscremove: Due to the addition of proper liching, skeletons as a choosable race
+ from magic mirrors has been discontinued. My apologies to the powergamers. A
+ special admin version of the mirror that allows for skeletons has also been
+ added to the code.
+ Miauw:
+ - tweak: 'AIs have received several minor nerfs in order to increase antagonist
+ counterplay:'
+ - tweak: AI tracking is no longer instant, it takes an amount of time that increases
+ with distance from the AI eye, up to 4 seconds. The AI detector item will light
+ up when an AI begins tracking.
+ - tweak: A random camera failure event has been added, which will break one or two
+ random cameras.
+ - tweak: You can no longer keep tracking people that are outside of your camera
+ vision.
+ - tweak: Camera wires have been removed. Screwdriver a camera to open the panel,
+ then use wirecutters to disable it or a multitool to change the focus.
+ - tweak: You can now hit cameras with items to break them. To repair a camera, simply
+ open the panel and use wirecutters on it.
+ - tweak: Camera alerts now only happen after a camera is reactivated.
+ RemieRichards:
+ - rscadd: New optional explosion effect ported from /vg/'s DeityLink, Explosions
+ that are affected by Walls and Doors
+2015-06-14:
+ Ikarrus:
+ - rscadd: White suits added to gang outfits
+ - tweak: Gang outfits are now free, but are now limited in stock (that replenishes
+ over time)
+ - tweak: While attempting a Hostile Takeover, gangs do not gain influence. Instead,
+ the takeover timer will be reduced by how many territories they control.
+ - tweak: Spraycan cost reduced to 5 influence.
+ - tweak: Recruitment Pen cooldown increased to 2 minutes, but is reduced if the
+ enemy gang has more members than yours.
+ - tweak: Tommy guns no longer deal stamina damage.
+ - rscdel: Gangtools can no longer recall the shuttle if the game mode is not Gang
+ War
+2015-06-15:
+ Incoming5643:
+ - rscadd: Lizards can now choose from a wide varity of physical appearances in character
+ creation! Sprites made by WJohn. Hiss Responsibly.
+ Kor:
+ - rscadd: A terrible new creature stalks the halls of SS13.
+ - rscadd: The wizard has a new artefact related to said creature.
+ - rscadd: Added a new sepia slime plasma reaction. Try it out!
+ spasticVerbalizer:
+ - rscfix: Drones can now properly quick-equip.
diff --git a/html/changelogs/KORPHAERON-TURF.yml b/html/changelogs/AnturK-pda.yml
similarity index 91%
rename from html/changelogs/KORPHAERON-TURF.yml
rename to html/changelogs/AnturK-pda.yml
index 01c08918078..ea5c073af7c 100644
--- a/html/changelogs/KORPHAERON-TURF.yml
+++ b/html/changelogs/AnturK-pda.yml
@@ -22,7 +22,7 @@
#################################
# Your name.
-author: KorPhaeron
+author: AnturK
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
@@ -33,4 +33,4 @@ delete-after: True
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- - rscadd: "You can now lay tiles on the asteroid. Go nuts building forts."
+ - rscadd: "Added new photo-over-pda function. Apply the photo to PDA to send it with your next message!"
diff --git a/html/changelogs/CandyClownTG.yml b/html/changelogs/CandyClownTG.yml
deleted file mode 100644
index 212952b415d..00000000000
--- a/html/changelogs/CandyClownTG.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-# bugfix
-# wip (For works in progress)
-# tweak
-# soundadd
-# sounddel
-# rscadd (general adding of nice things)
-# rscdel (general deleting of nice things)
-# imageadd
-# imagedel
-# spellcheck (typo fixes)
-# experiment
-# tgs (TG-ported fixes?)
-#################################
-
-# Your name.
-author: CandyClown
-
-# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made. See valid prefix list above.
-# INDENT WITH TWO SPACES. NOT TABS. SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
-# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes:
- - tweak: "Ointments, bruise packs, and gauze are now stacked to 6 instead of 5."
diff --git a/html/changelogs/CorruptComputer-BoxFixes.yml b/html/changelogs/CorruptComputer-BoxFixes.yml
deleted file mode 100644
index 49474b0be95..00000000000
--- a/html/changelogs/CorruptComputer-BoxFixes.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-author: CorruptComputer
-
-delete-after: True
-
-changes:
- - bugfix: "Security lockers no longer spawn in front of each other on Box."
- - bugfix: "Hooked up the scrubbers in QM's office on Box."
- - bugfix: "Fixed bar disposals on Box"
- - bugfix: "Fixed the stacked heater+freezer in expirementor maint on Box"
- - tweak: "Made the turbine into Atmos and Engineering access only, and renamed the doors to Turbine on Box."
-
diff --git a/html/changelogs/Cuboos-WizardSounds.yml b/html/changelogs/Cuboos-WizardSounds.yml
deleted file mode 100644
index eccd5fade93..00000000000
--- a/html/changelogs/Cuboos-WizardSounds.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Cuboos
-delete-after: True
-
-changes:
- - rscadd: "Added casting and firing sounds for wizard spells and staves."
- - rscadd: "A new title theme has been added."
\ No newline at end of file
diff --git a/html/changelogs/Gun-Hog-PR-9667.yml b/html/changelogs/Gun-Hog-PR-9667.yml
deleted file mode 100644
index a4cb8509a70..00000000000
--- a/html/changelogs/Gun-Hog-PR-9667.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-# bugfix
-# wip (For works in progress)
-# tweak
-# soundadd
-# sounddel
-# rscadd (general adding of nice things)
-# rscdel (general deleting of nice things)
-# imageadd
-# imagedel
-# spellcheck (typo fixes)
-# experiment
-# tgs (TG-ported fixes?)
-#################################
-
-# Your name.
-author: Gun Hog
-
-# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made. See valid prefix list above.
-# INDENT WITH TWO SPACES. NOT TABS. SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
-# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes:
- - rscadd: "Nanotrasen has approved the designs for destination taggers and hand labelers in the autolathe."
diff --git a/html/changelogs/Ikarrus-gangmessage.yml b/html/changelogs/Ikarrus-deptmanagement.yml
similarity index 87%
rename from html/changelogs/Ikarrus-gangmessage.yml
rename to html/changelogs/Ikarrus-deptmanagement.yml
index 9da3c5a3ffe..7cbd7300139 100644
--- a/html/changelogs/Ikarrus-gangmessage.yml
+++ b/html/changelogs/Ikarrus-deptmanagement.yml
@@ -33,5 +33,4 @@ delete-after: True
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- - rscadd: "Gang Bosses will now be able to discreetly send messages to everyone in their gang for 5 influence a message."
- - tweak: "Conversion pens now use a flat 60sec cooldown rate."
\ No newline at end of file
+ - rscadd: "Department Management consoles have been added to Head of Staff offices. These will enable heads to modify ID's access to their department, as well as preform demotions."
\ No newline at end of file
diff --git a/html/changelogs/Incoming5643 - whycantwebefriend.yml b/html/changelogs/Incoming5643 - whycantwebefriend.yml
deleted file mode 100644
index d6cd2a65311..00000000000
--- a/html/changelogs/Incoming5643 - whycantwebefriend.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: Incoming5643
-
-delete-after: True
-
-changes:
- - rscadd: "Antagonists with escape alone can now escape with others on the shuttle, so long as they are also antagonists."
- - rscadd: "Antagonists with escape alone can also win if non-antagonists are on the shuttle provided they are locked in the brig."
- - rscadd: "Escaping to syndicate space on board the nuke op shuttle is now a valid way to escape the station."
diff --git a/html/changelogs/Miauw-AINerfTweaks.yml b/html/changelogs/Miauw-AINerfTweaks.yml
new file mode 100644
index 00000000000..02b290595d3
--- /dev/null
+++ b/html/changelogs/Miauw-AINerfTweaks.yml
@@ -0,0 +1,7 @@
+author: Miauw
+delete-after: True
+changes:
+ - tweak: "Bullets can now damage cameras."
+ - tweak: "Camera alarms now trigger 90 seconds after the first EMP pulse, instead of when all EMP pulses run out."
+ - tweak: "Makes the force required to damage cameras greater than or equal to ten instead of greater than ten."
+ - tweak: "Camera alarms now trigger when cameras are disabled with brute force or bullets."
\ No newline at end of file
diff --git a/html/changelogs/Xhuis-Superlarity.yml b/html/changelogs/Xhuis-Superlarity.yml
new file mode 100644
index 00000000000..79559c527c3
--- /dev/null
+++ b/html/changelogs/Xhuis-Superlarity.yml
@@ -0,0 +1,5 @@
+author: Xhuis
+delete-after: True
+
+changes:
+ - rscadd: "Nanotrasen scientists have determined that a delaminating supermatter shard combining with a gravitational singularity is an extremely bad idea. They advise keeping the two as far apart as possible."
diff --git a/html/changelogs/jordie restart.yml b/html/changelogs/jordie restart.yml
deleted file mode 100644
index 4c581575db8..00000000000
--- a/html/changelogs/jordie restart.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Jordie0608
-
-delete-after: True
-
-changes:
- - rscadd: "Admin-delaying the round now works once it has finished."
\ No newline at end of file
diff --git a/html/changelogs/palpatine213-hudemag.yml b/html/changelogs/palpatine213-hudemag.yml
deleted file mode 100644
index cd2b300bb20..00000000000
--- a/html/changelogs/palpatine213-hudemag.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-# bugfix
-# wip (For works in progress)
-# tweak
-# soundadd
-# sounddel
-# rscadd (general adding of nice things)
-# rscdel (general deleting of nice things)
-# imageadd
-# imagedel
-# spellcheck (typo fixes)
-# experiment
-# tgs (TG-ported fixes?)
-#################################
-
-# Your name.
-author: Palpatine213
-
-# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made. See valid prefix list above.
-# INDENT WITH TWO SPACES. NOT TABS. SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
-# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes:
- - tweak: "Allows sechuds to have their id locks removed via emag as well as EMP"
-
diff --git a/html/changelogs/phil235-XrayGunNerf.yml b/html/changelogs/phil235-XrayGunNerf.yml
new file mode 100644
index 00000000000..0cdfb5b9318
--- /dev/null
+++ b/html/changelogs/phil235-XrayGunNerf.yml
@@ -0,0 +1,6 @@
+author: phil235
+
+delete-after: True
+
+changes:
+ - rscdel: "Nerfed the xray gun. Its range is now 15 tiles."
diff --git a/icons/effects/160x160.dmi b/icons/effects/160x160.dmi
index 57e3a81edf1..8c733232f93 100644
Binary files a/icons/effects/160x160.dmi and b/icons/effects/160x160.dmi differ
diff --git a/icons/effects/352x352.dmi b/icons/effects/352x352.dmi
new file mode 100644
index 00000000000..86b40959d56
Binary files /dev/null and b/icons/effects/352x352.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 1fe7f1c5713..39df26748eb 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/misc/buildmode.dmi b/icons/misc/buildmode.dmi
index a885e76d549..089427111f2 100644
Binary files a/icons/misc/buildmode.dmi and b/icons/misc/buildmode.dmi differ
diff --git a/icons/mob/actions.dmi b/icons/mob/actions.dmi
index bc98f542874..4ced7caebed 100644
Binary files a/icons/mob/actions.dmi and b/icons/mob/actions.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 522826b5530..934435bd835 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi
index 7b47bec0962..8f924ee6632 100644
Binary files a/icons/mob/human.dmi and b/icons/mob/human.dmi differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index ee03734f007..3bbd054bce7 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/mob/mutant_bodyparts.dmi b/icons/mob/mutant_bodyparts.dmi
index 6221fbad9e7..94acba1cbc5 100644
Binary files a/icons/mob/mutant_bodyparts.dmi and b/icons/mob/mutant_bodyparts.dmi differ
diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi
index 7a0c7a6599a..0ed43592376 100644
Binary files a/icons/mob/screen_alert.dmi and b/icons/mob/screen_alert.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index dd1f96dcbfe..6572955ff2b 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index 9c5ddae42c1..42e1b95b2c0 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index f4d22e41ee2..59ac6436d18 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index b56aa44170d..deca94b24fa 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi
index 4a7846286da..6c8fd8bc903 100644
Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ
diff --git a/icons/obj/crayons.dmi b/icons/obj/crayons.dmi
index a3966103053..7d3489285c3 100644
Binary files a/icons/obj/crayons.dmi and b/icons/obj/crayons.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index 473e51f6964..5a3e80c66f7 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/hydroponics/equipment.dmi b/icons/obj/hydroponics/equipment.dmi
index 25a4bee8e63..904eb38c53c 100644
Binary files a/icons/obj/hydroponics/equipment.dmi and b/icons/obj/hydroponics/equipment.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index 4988bb5a4c6..d485b53a828 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ
diff --git a/icons/obj/machines/dominator.dmi b/icons/obj/machines/dominator.dmi
new file mode 100644
index 00000000000..7671dedff86
Binary files /dev/null and b/icons/obj/machines/dominator.dmi differ
diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi
index 4d6c9a00bbb..f51725357a4 100644
Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ
diff --git a/icons/obj/recycling.dmi b/icons/obj/recycling.dmi
index 8661194c0d9..297eaf76e2f 100644
Binary files a/icons/obj/recycling.dmi and b/icons/obj/recycling.dmi differ
diff --git a/icons/obj/singularity.dmi b/icons/obj/singularity.dmi
index cc0156de462..3a9a5514b64 100644
Binary files a/icons/obj/singularity.dmi and b/icons/obj/singularity.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index a30ab24fcbe..1797ac7cee0 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/icons/obj/stock_parts.dmi b/icons/obj/stock_parts.dmi
index 03e4bae5b5f..8b5b5b812e4 100644
Binary files a/icons/obj/stock_parts.dmi and b/icons/obj/stock_parts.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 175cfab6122..aac16abbd38 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index 682103c7dcb..f7d418e6fcb 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 91d53ce1dfd..41373c350c1 100644
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/icons/obj/wizard.dmi b/icons/obj/wizard.dmi
index e3eec0a88ac..3624a9b4bff 100644
Binary files a/icons/obj/wizard.dmi and b/icons/obj/wizard.dmi differ
diff --git a/sound/arcade/Boom.ogg b/sound/arcade/Boom.ogg
new file mode 100644
index 00000000000..8adfb2bc430
Binary files /dev/null and b/sound/arcade/Boom.ogg differ
diff --git a/sound/arcade/Heal.ogg b/sound/arcade/Heal.ogg
new file mode 100644
index 00000000000..26f47195c65
Binary files /dev/null and b/sound/arcade/Heal.ogg differ
diff --git a/sound/arcade/Hit.ogg b/sound/arcade/Hit.ogg
new file mode 100644
index 00000000000..0bf18679a65
Binary files /dev/null and b/sound/arcade/Hit.ogg differ
diff --git a/sound/arcade/Lose.ogg b/sound/arcade/Lose.ogg
new file mode 100644
index 00000000000..dd2145737cd
Binary files /dev/null and b/sound/arcade/Lose.ogg differ
diff --git a/sound/arcade/Mana.ogg b/sound/arcade/Mana.ogg
new file mode 100644
index 00000000000..7f26ae53fe7
Binary files /dev/null and b/sound/arcade/Mana.ogg differ
diff --git a/sound/arcade/Steal.ogg b/sound/arcade/Steal.ogg
new file mode 100644
index 00000000000..9c7b3be2a5a
Binary files /dev/null and b/sound/arcade/Steal.ogg differ
diff --git a/sound/arcade/Win.ogg b/sound/arcade/Win.ogg
new file mode 100644
index 00000000000..27fb9725f20
Binary files /dev/null and b/sound/arcade/Win.ogg differ
diff --git a/sound/effects/pray.ogg b/sound/effects/pray.ogg
new file mode 100644
index 00000000000..beadd3916f1
Binary files /dev/null and b/sound/effects/pray.ogg differ
diff --git a/sound/effects/pray_chaplain.ogg b/sound/effects/pray_chaplain.ogg
new file mode 100644
index 00000000000..1b543275311
Binary files /dev/null and b/sound/effects/pray_chaplain.ogg differ
diff --git a/sound/items/PSHOOM.ogg b/sound/items/PSHOOM.ogg
new file mode 100644
index 00000000000..5628842f534
Binary files /dev/null and b/sound/items/PSHOOM.ogg differ
diff --git a/sound/items/PSHOOM_2.ogg b/sound/items/PSHOOM_2.ogg
new file mode 100644
index 00000000000..480b302fad8
Binary files /dev/null and b/sound/items/PSHOOM_2.ogg differ
diff --git a/sound/magic/Demon_consume.ogg b/sound/magic/Demon_consume.ogg
new file mode 100644
index 00000000000..ef9276e74c0
Binary files /dev/null and b/sound/magic/Demon_consume.ogg differ
diff --git a/sound/magic/TIMEPARADOX2.ogg b/sound/magic/TIMEPARADOX2.ogg
new file mode 100644
index 00000000000..d35aeb389f6
Binary files /dev/null and b/sound/magic/TIMEPARADOX2.ogg differ
diff --git a/sound/magic/demon_attack1.ogg b/sound/magic/demon_attack1.ogg
new file mode 100644
index 00000000000..e3c765afd0c
Binary files /dev/null and b/sound/magic/demon_attack1.ogg differ
diff --git a/sound/magic/demon_dies.ogg b/sound/magic/demon_dies.ogg
new file mode 100644
index 00000000000..ad2a95f397d
Binary files /dev/null and b/sound/magic/demon_dies.ogg differ
diff --git a/sound/magic/enter_blood.ogg b/sound/magic/enter_blood.ogg
new file mode 100644
index 00000000000..4deba11b465
Binary files /dev/null and b/sound/magic/enter_blood.ogg differ
diff --git a/sound/magic/exit_blood.ogg b/sound/magic/exit_blood.ogg
new file mode 100644
index 00000000000..c4399a2ecc6
Binary files /dev/null and b/sound/magic/exit_blood.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index 55616d11204..d9cf55015de 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -227,6 +227,7 @@
#include "code\datums\spells\genetic.dm"
#include "code\datums\spells\inflict_handler.dm"
#include "code\datums\spells\knock.dm"
+#include "code\datums\spells\lichdom.dm"
#include "code\datums\spells\lightning.dm"
#include "code\datums\spells\mime.dm"
#include "code\datums\spells\mind_transfer.dm"
@@ -240,7 +241,6 @@
#include "code\datums\wires\alarm.dm"
#include "code\datums\wires\apc.dm"
#include "code\datums\wires\autolathe.dm"
-#include "code\datums\wires\camera.dm"
#include "code\datums\wires\explosive.dm"
#include "code\datums\wires\mulebot.dm"
#include "code\datums\wires\particle_accelerator.dm"
@@ -326,7 +326,9 @@
#include "code\game\gamemodes\cult\runes.dm"
#include "code\game\gamemodes\cult\talisman.dm"
#include "code\game\gamemodes\extended\extended.dm"
+#include "code\game\gamemodes\gang\dominator.dm"
#include "code\game\gamemodes\gang\gang.dm"
+#include "code\game\gamemodes\gang\recaller.dm"
#include "code\game\gamemodes\malfunction\Malf_Modules.dm"
#include "code\game\gamemodes\malfunction\malfunction.dm"
#include "code\game\gamemodes\meteor\meteor.dm"
@@ -431,7 +433,6 @@
#include "code\game\machinery\camera\motion.dm"
#include "code\game\machinery\camera\presets.dm"
#include "code\game\machinery\camera\tracking.dm"
-#include "code\game\machinery\computer\ai_core.dm"
#include "code\game\machinery\computer\aifixer.dm"
#include "code\game\machinery\computer\arcade.dm"
#include "code\game\machinery\computer\atmos_alert.dm"
@@ -551,6 +552,7 @@
#include "code\game\objects\effects\spawners\bombspawner.dm"
#include "code\game\objects\effects\spawners\gibspawner.dm"
#include "code\game\objects\effects\spawners\lootdrop.dm"
+#include "code\game\objects\effects\spawners\structure.dm"
#include "code\game\objects\effects\spawners\vaultspawner.dm"
#include "code\game\objects\items\apc_frame.dm"
#include "code\game\objects\items\blueprints.dm"
@@ -579,7 +581,6 @@
#include "code\game\objects\items\devices\pipe_painter.dm"
#include "code\game\objects\items\devices\pizza_bomb.dm"
#include "code\game\objects\items\devices\powersink.dm"
-#include "code\game\objects\items\devices\recaller.dm"
#include "code\game\objects\items\devices\scanners.dm"
#include "code\game\objects\items\devices\sensor_device.dm"
#include "code\game\objects\items\devices\taperecorder.dm"
@@ -685,6 +686,7 @@
#include "code\game\objects\items\weapons\tanks\tank_types.dm"
#include "code\game\objects\items\weapons\tanks\tanks.dm"
#include "code\game\objects\items\weapons\tanks\watertank.dm"
+#include "code\game\objects\structures\ai_core.dm"
#include "code\game\objects\structures\artstuff.dm"
#include "code\game\objects\structures\barsigns.dm"
#include "code\game\objects\structures\bedsheet_bin.dm"
@@ -801,6 +803,7 @@
#include "code\modules\admin\newbanjob.dm"
#include "code\modules\admin\player_notes.dm"
#include "code\modules\admin\player_panel.dm"
+#include "code\modules\admin\secrets.dm"
#include "code\modules\admin\topic.dm"
#include "code\modules\admin\DB ban\functions.dm"
#include "code\modules\admin\permissionverbs\permissionedit.dm"
@@ -818,6 +821,7 @@
#include "code\modules\admin\verbs\diagnostics.dm"
#include "code\modules\admin\verbs\fps.dm"
#include "code\modules\admin\verbs\getlogs.dm"
+#include "code\modules\admin\verbs\machine_upgrade.dm"
#include "code\modules\admin\verbs\mapping.dm"
#include "code\modules\admin\verbs\massmodvar.dm"
#include "code\modules\admin\verbs\modifyvariables.dm"
@@ -930,6 +934,7 @@
#include "code\modules\events\anomaly_vortex.dm"
#include "code\modules\events\blob.dm"
#include "code\modules\events\brand_intelligence.dm"
+#include "code\modules\events\camerafailure.dm"
#include "code\modules\events\carp_migration.dm"
#include "code\modules\events\communications_blackout.dm"
#include "code\modules\events\disease_outbreak.dm"
@@ -1239,6 +1244,8 @@
#include "code\modules\mob\living\simple_animal\revenant\revenant.dm"
#include "code\modules\mob\living\simple_animal\revenant\revenant_abilities.dm"
#include "code\modules\mob\living\simple_animal\revenant\revenant_spawn_event.dm"
+#include "code\modules\mob\living\simple_animal\slaughter\slaughter.dm"
+#include "code\modules\mob\living\simple_animal\slaughter\slaughterevent.dm"
#include "code\modules\mob\living\simple_animal\slime\death.dm"
#include "code\modules\mob\living\simple_animal\slime\emote.dm"
#include "code\modules\mob\living\simple_animal\slime\life.dm"
@@ -1331,8 +1338,12 @@
#include "code\modules\procedural mapping\mapGenerator.dm"
#include "code\modules\procedural mapping\mapGeneratorModule.dm"
#include "code\modules\procedural mapping\mapGeneratorReadme.dm"
+#include "code\modules\procedural mapping\mapGeneratorModules\helpers.dm"
#include "code\modules\procedural mapping\mapGeneratorModules\nature.dm"
+#include "code\modules\procedural mapping\mapGenerators\asteroid.dm"
#include "code\modules\procedural mapping\mapGenerators\nature.dm"
+#include "code\modules\procedural mapping\mapGenerators\shuttle.dm"
+#include "code\modules\procedural mapping\mapGenerators\syndicate.dm"
#include "code\modules\projectiles\ammunition.dm"
#include "code\modules\projectiles\firing.dm"
#include "code\modules\projectiles\gun.dm"
diff --git a/tools/dmifonts/DmiFonts.exe b/tools/dmifonts/DmiFonts.exe
new file mode 100644
index 00000000000..ce1d694147a
Binary files /dev/null and b/tools/dmifonts/DmiFonts.exe differ
diff --git a/tools/dmifonts/DmiFonts.int b/tools/dmifonts/DmiFonts.int
new file mode 100644
index 00000000000..b82874fded5
--- /dev/null
+++ b/tools/dmifonts/DmiFonts.int
@@ -0,0 +1,6 @@
+// BEGIN_INTERNALS
+/*
+MAP_ICON_TYPE: 0
+AUTO_FILE_DIR: OFF
+*/
+// END_INTERNALS
diff --git a/tools/dmifonts/DmiFonts.lk b/tools/dmifonts/DmiFonts.lk
new file mode 100644
index 00000000000..e69de29bb2d
" \
+ + "", "window=book;size=192x192")
+ onclose(M, "PDA Photo")
/datum/data_rc_msg
var/rec_dpt = "Unspecified" //name of the person
@@ -105,8 +119,9 @@ var/global/list/obj/machinery/message_server/message_servers = list()
/obj/machinery/message_server/proc/send_chat_message(var/sender = "", var/channel = "", var/message = "")
chat_msgs += new/datum/data_chat_msg(sender,channel,message)
-/obj/machinery/message_server/proc/send_pda_message(var/recipient = "",var/sender = "",var/message = "")
- pda_msgs += new/datum/data_pda_msg(recipient,sender,message)
+/obj/machinery/message_server/proc/send_pda_message(var/recipient = "",var/sender = "",var/message = "",var/photo=null)
+ . = new/datum/data_pda_msg(recipient,sender,message,photo)
+ pda_msgs += .
/obj/machinery/message_server/proc/send_rc_message(var/recipient = "",var/sender = "",var/message = "",var/stamp = "", var/id_auth = "", var/priority = 1)
rc_msgs += new/datum/data_rc_msg(recipient,sender,message,stamp,id_auth)
@@ -177,6 +192,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
/datum/feedback_variable/proc/add_details(var/text)
if (istext(text))
+ text = replacetext(text, " ", "_")
if (!details)
details = text
else
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index 9322e7c9286..b616d036397 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -145,7 +145,7 @@ Note: Must be placed west/left of and R&D console to function.
if (disabled)
return
if (!linked_console)
- user << " The [src.name] must be linked to an R&D console first!"
+ user << "The [src.name] must be linked to an R&D console first!"
return 1
if (busy)
user << "The [src.name] is busy! Please wait for completion of previous operation."
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index d076c813158..3182c0156d0 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -31,7 +31,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
/obj/machinery/computer/rdconsole
name = "R&D Console"
- icon_state = "rdcomp"
+ icon_screen = "rdcomp"
+ icon_keyboard = "rd_key"
circuit = /obj/item/weapon/circuitboard/rdconsole
var/datum/research/files //Stores all the collected research data.
var/obj/item/weapon/disk/tech_disk/t_disk = null //Stores the technology disk.
@@ -154,11 +155,11 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(istype(D, /obj/item/weapon/disk/tech_disk)) t_disk = D
else if (istype(D, /obj/item/weapon/disk/design_disk)) d_disk = D
else
- user << " Machine cannot accept disks in that format."
+ user << "Machine cannot accept disks in that format."
return
user.drop_item()
D.loc = src
- user << " You add the disk to the machine!"
+ user << "You add the disk to the machine!"
else
..()
src.updateUsrDialog()
@@ -168,7 +169,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(!emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
- user << " You disable the security protocols"
+ user << "You disable the security protocols"
/obj/machinery/computer/rdconsole/Topic(href, href_list)
if(..())
@@ -237,7 +238,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
else if(href_list["eject_item"]) //Eject the item inside the destructive analyzer.
if(linked_destroy)
if(linked_destroy.busy)
- usr << " The destructive analyzer is busy at the moment."
+ usr << "The destructive analyzer is busy at the moment."
else if(linked_destroy.loaded_item)
linked_destroy.loaded_item.loc = linked_destroy.loc
@@ -248,7 +249,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
else if(href_list["deconstruct"]) //Deconstruct the item in the destructive analyzer and update the research holder.
if(linked_destroy)
if(linked_destroy.busy)
- usr << " The destructive analyzer is busy at the moment."
+ usr << "The destructive analyzer is busy at the moment."
else
var/choice = input("Proceeding will destroy loaded item.") in list("Proceed", "Cancel")
if(choice == "Cancel" || !linked_destroy) return
@@ -261,7 +262,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
linked_destroy.busy = 0
if(!linked_destroy.hacked)
if(!linked_destroy.loaded_item)
- usr <<" The destructive analyzer appears to be empty."
+ usr <<"The destructive analyzer appears to be empty."
screen = 1.0
return
if((linked_destroy.loaded_item.reliability >= 99 - (linked_destroy.decon_mod * 3)) || linked_destroy.loaded_item.crit_fail)
@@ -276,6 +277,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(linked_lathe) //Also sends salvaged materials to a linked protolathe, if any.
linked_lathe.m_amount += min((linked_lathe.max_material_storage - linked_lathe.TotalMaterials()), (linked_destroy.loaded_item.m_amt*(linked_destroy.decon_mod/10)))
linked_lathe.g_amount += min((linked_lathe.max_material_storage - linked_lathe.TotalMaterials()), (linked_destroy.loaded_item.g_amt*(linked_destroy.decon_mod/10)))
+ feedback_add_details("item_deconstructed","[linked_destroy.loaded_item.name]")
linked_destroy.loaded_item = null
else
screen = 1.0
@@ -306,7 +308,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
else if(href_list["sync"]) //Sync the research holder with all the R&D consoles in the game that aren't sync protected.
screen = 0.0
if(!sync)
- usr << " You must connect to the network first!"
+ usr << "You must connect to the network first!"
else
griefProtection() //Putting this here because I dont trust the sync process
spawn(30)
@@ -406,6 +408,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
var/R = being_built.reliability
spawn(32*amount/coeff)
if(g2g) //And if we only fail the material requirements, we still spend time and power
+ var/already_logged = 0
for(var/i = 0, i