Soul Stone
"
+ for(var/mob/living/simple_animal/shade/A in src)
+ dat += "Captured Soul: [A.name]
"
+ dat += {"Summon Shade"}
+ dat += "
"
+ dat += {" Close"}
+ user << browse(dat, "window=aicard")
+ onclose(user, "aicard")
+ return
+
+/obj/item/device/soulstone/Topic(href, href_list)
+ var/mob/U = usr
+ if(!in_range(src, U) || U.machine != src || !can_use(usr))
+ U << browse(null, "window=aicard")
+ U.unset_machine()
+ return
+
+ add_fingerprint(U)
+ U.set_machine(src)
+
+ switch(href_list["choice"])//Now we switch based on choice.
+ if("Close")
U << browse(null, "window=aicard")
U.unset_machine()
return
- add_fingerprint(U)
- U.set_machine(src)
-
- switch(href_list["choice"])//Now we switch based on choice.
- if("Close")
- U << browse(null, "window=aicard")
- U.unset_machine()
- return
-
- if("Summon")
- for(var/mob/living/simple_animal/shade/A in src)
- A.status_flags &= ~GODMODE
- A.canmove = 1
- to_chat(A, "You have been released from your prison, but you are still bound to [U.name]'s will. Help them suceed in their goals at all costs.")
- A.loc = U.loc
- A.cancel_camera()
- src.icon_state = "soulstone"
- attack_self(U)
+ if("Summon")
+ for(var/mob/living/simple_animal/shade/A in src)
+ A.status_flags &= ~GODMODE
+ A.canmove = 1
+ A.forceMove(get_turf(usr))
+ A.cancel_camera()
+ icon_state = "soulstone"
+ name = initial(name)
+ if(iswizard(usr) || usability)
+ to_chat(A, "You have been released from your prison, but you are still bound to [usr.real_name]'s will. Help them succeed in their goals at all costs.")
+ else if(iscultist(usr))
+ to_chat(A, "You have been released from your prison, but you are still bound to the cult's will. Help them succeed in their goals at all costs.")
+ was_used()
+ attack_self(U)
///////////////////////////Transferring to constructs/////////////////////////////////////////////////////
/obj/structure/constructshell
@@ -93,15 +127,30 @@
icon = 'icons/obj/wizard.dmi'
icon_state = "construct"
desc = "A wicked machine used by those skilled in magical arts. It is inactive"
+
+/obj/structure/constructshell/examine(mob/user)
+ if(..(user, 0))
+ if(iscultist(user) || iswizard(user) || user.stat == DEAD)
+ to_chat(user, "A construct shell, used to house bound souls from a soulstone.")
+ to_chat(user, "Placing a soulstone with a soul into this shell allows you to produce your choice of the following:")
+ to_chat(user, "An Artificer, which can produce more shells and soulstones, as well as fortifications.")
+ to_chat(user, "A Wraith, which does high damage and can jaunt through walls, though it is quite fragile.")
+ to_chat(user, "A Juggernaut, which is very hard to kill and can produce temporary walls, but is slow.")
/obj/structure/constructshell/attackby(obj/item/O as obj, mob/user as mob, params)
if(istype(O, /obj/item/device/soulstone))
- O.transfer_soul("CONSTRUCT",src,user)
-
+ var/obj/item/device/soulstone/SS = O
+ if(!SS.can_use(user))
+ to_chat(user, "An overwhelming feeling of dread comes over you as you attempt to place the soulstone into the shell. It would be wise to be rid of this quickly.")
+ user.Dizzy(120)
+ return
+ SS.transfer_soul("CONSTRUCT",src,user)
+ SS.was_used()
+ else
+ return ..()
////////////////////////////Proc for moving soul in and out off stone//////////////////////////////////////
-
/obj/item/proc/transfer_soul(var/choice as text, var/target, var/mob/U as mob).
switch(choice)
if("FORCE")
@@ -238,7 +287,6 @@
to_chat(newstruct, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.")
newstruct.cancel_camera()
-
/obj/item/device/soulstone/proc/init_shade(mob/living/carbon/human/T, mob/U, vic = 0)
new /obj/effect/decal/remains/human(T.loc) //Spawns a skeleton
T.invisibility = 101
@@ -268,7 +316,6 @@
if(vic && U)
to_chat(U, "Capture successful!: [T.real_name]'s soul has been ripped from their body and stored within the soul stone.")
-
/obj/item/device/soulstone/proc/getCultGhost(mob/living/carbon/human/T, mob/U)
var/mob/dead/observer/chosen_ghost
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index 0f280b6b4a2..3c59d47f020 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -103,7 +103,7 @@
/datum/spellbook_entry/fireball
name = "Fireball"
- spell_type = /obj/effect/proc_holder/spell/dumbfire/fireball
+ spell_type = /obj/effect/proc_holder/spell/fireball
log_name = "FB"
/datum/spellbook_entry/magicm
@@ -714,7 +714,7 @@
return
/obj/item/weapon/spellbook/oneuse/fireball
- spell = /obj/effect/proc_holder/spell/dumbfire/fireball
+ spell = /obj/effect/proc_holder/spell/fireball
spellname = "fireball"
icon_state ="bookfireball"
desc = "This book feels warm to the touch."
@@ -848,9 +848,14 @@
to_chat(user, "[src] suddenly vanishes!")
qdel(src)
-
/obj/item/weapon/spellbook/oneuse/fake_gib
spell = /obj/effect/proc_holder/spell/targeted/touch/fake_disintegrate
spellname = "disintegrate"
icon_state ="bookfireball"
desc = "This book feels like it will rip stuff apart."
+
+/obj/item/weapon/spellbook/oneuse/sacredflame
+ spell = /obj/effect/proc_holder/spell/targeted/sacred_flame
+ spellname = "sacred flame"
+ icon_state ="booksacredflame"
+ desc = "Become one with the flames that burn within... and invite others to do so as well."
\ No newline at end of file
diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm
index eedb50a8412..1331db02791 100644
--- a/code/game/jobs/job/silicon.dm
+++ b/code/game/jobs/job/silicon.dm
@@ -8,7 +8,7 @@
supervisors = "your laws"
req_admin_notify = 1
minimal_player_age = 30
- exp_requirements = 600
+ exp_requirements = 1200
exp_type = EXP_TYPE_CREW
equip(var/mob/living/carbon/human/H)
diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
index 090fc6681a0..981753c5aee 100644
--- a/code/game/jobs/job/supervisor.dm
+++ b/code/game/jobs/job/supervisor.dm
@@ -13,7 +13,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
access = list() //See get_access()
minimal_access = list() //See get_access()
minimal_player_age = 30
- exp_requirements = 600
+ exp_requirements = 1200
exp_type = EXP_TYPE_CREW
equip(var/mob/living/carbon/human/H)
if(!H) return 0
@@ -237,6 +237,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
minimal_access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels)
alt_titles = list("Lawyer","Public Defender")
minimal_player_age = 30
+ exp_requirements = 300
+ exp_type = EXP_TYPE_CREW
idtype = /obj/item/weapon/card/id/security
equip(var/mob/living/carbon/human/H)
diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm
index f4c1118ce59..2148c339000 100644
--- a/code/game/jobs/job/support.dm
+++ b/code/game/jobs/job/support.dm
@@ -76,8 +76,8 @@
is_service = 1
supervisors = "the head of personnel"
selection_color = "#dddddd"
- access = list(access_hydroponics, access_bar, access_kitchen)
- minimal_access = list(access_hydroponics, access_maint_tunnels)
+ access = list(access_hydroponics, access_bar, access_kitchen, access_morgue)
+ minimal_access = list(access_hydroponics, access_morgue, access_maint_tunnels)
alt_titles = list("Hydroponicist", "Botanical Researcher")
@@ -92,7 +92,7 @@
H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_or_collect(new /obj/item/clothing/gloves/botanic_leather(H), slot_gloves)
H.equip_or_collect(new /obj/item/clothing/suit/apron(H), slot_wear_suit)
- H.equip_or_collect(new /obj/item/device/analyzer/plant_analyzer(H), slot_s_store)
+ H.equip_or_collect(new /obj/item/device/plant_analyzer(H), slot_s_store)
H.equip_or_collect(new /obj/item/device/pda/botanist(H), slot_wear_pda)
H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack)
return 1
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 5da3d8cad2d..a770084dbbc 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -51,6 +51,8 @@ var/global/datum/controller/occupations/job_master
if(!job) return 0
if(jobban_isbanned(player, rank)) return 0
if(!job.player_old_enough(player.client)) return 0
+ if(job.available_in_playtime(player.client))
+ return 0
if(!is_job_whitelisted(player, rank)) return 0
var/position_limit = job.total_positions
if(!latejoin)
@@ -87,13 +89,16 @@ var/global/datum/controller/occupations/job_master
Debug("Running FOC, Job: [job], Level: [level], Flag: [flag]")
var/list/candidates = list()
for(var/mob/new_player/player in unassigned)
- Debug(" - Player: [player] Banned: [jobban_isbanned(player, job.title)] Old Enough: [!job.player_old_enough(player.client)] Flag && Be Special: [flag] && [player.client.prefs.be_special] Job Department: [player.client.prefs.GetJobDepartment(job, level)] Job Flag: [job.flag] Job Department Flag = [job.department_flag]")
+ Debug(" - Player: [player] Banned: [jobban_isbanned(player, job.title)] Old Enough: [!job.player_old_enough(player.client)] AvInPlaytime: [job.available_in_playtime(player.client)] Flag && Be Special: [flag] && [player.client.prefs.be_special] Job Department: [player.client.prefs.GetJobDepartment(job, level)] Job Flag: [job.flag] Job Department Flag = [job.department_flag]")
if(jobban_isbanned(player, job.title))
Debug("FOC isbanned failed, Player: [player]")
continue
if(!job.player_old_enough(player.client))
Debug("FOC player not old enough, Player: [player]")
continue
+ if(job.available_in_playtime(player.client))
+ Debug("FOC player not enough playtime, Player: [player]")
+ continue
if(flag && !(flag in player.client.prefs.be_special))
Debug("FOC flag failed, Player: [player], Flag: [flag], ")
continue
@@ -123,9 +128,6 @@ var/global/datum/controller/occupations/job_master
if(job.admin_only) // No admin positions either.
continue
- if(job.available_in_playtime(player.client))
- continue
-
if(jobban_isbanned(player, job.title))
Debug("GRJ isbanned failed, Player: [player], Job: [job.title]")
continue
@@ -134,6 +136,10 @@ var/global/datum/controller/occupations/job_master
Debug("GRJ player not old enough, Player: [player]")
continue
+ if(job.available_in_playtime(player.client))
+ Debug("GRJ player not enough playtime, Player: [player]")
+ continue
+
if(player.mind && job.title in player.mind.restricted_roles)
Debug("GRJ incompatible with antagonist role, Player: [player], Job: [job.title]")
continue
@@ -313,6 +319,10 @@ var/global/datum/controller/occupations/job_master
Debug("DO player not old enough, Player: [player], Job:[job.title]")
continue
+ if(job.available_in_playtime(player.client))
+ Debug("DO player not enough playtime, Player: [player], Job:[job.title]")
+ continue
+
if(player.mind && job.title in player.mind.restricted_roles)
Debug("DO incompatible with antagonist role, Player: [player], Job:[job.title]")
continue
@@ -674,6 +684,9 @@ var/global/datum/controller/occupations/job_master
if(!job.player_old_enough(player.client))
level6++
continue
+ if(job.available_in_playtime(player.client))
+ level6++
+ continue
if(player.client.prefs.GetJobDepartment(job, 1) & job.flag)
level1++
else if(player.client.prefs.GetJobDepartment(job, 2) & job.flag)
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index f7b793b6033..4f9e357cd61 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -453,6 +453,7 @@
occupantData["intOrgan"] = intOrganData
occupantData["blind"] = (H.disabilities & BLIND)
+ occupantData["colourblind"] = (H.disabilities & COLOURBLIND)
occupantData["nearsighted"] = (H.disabilities & NEARSIGHTED)
data["occupant"] = occupantData
@@ -639,6 +640,8 @@
dat += ""
if(occupant.disabilities & BLIND)
dat += "Cataracts detected.
"
+ if(occupant.disabilities & COLOURBLIND)
+ dat += "Photoreceptor abnormalities detected.
"
if(occupant.disabilities & NEARSIGHTED)
dat += "Retinal misalignment detected.
"
else
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index a5db47222e6..efa6a1ded81 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -572,34 +572,6 @@
frequency.post_signal(src, alert_signal)
-/obj/machinery/alarm/proc/air_doors_close(manual)
- var/area/A = get_area(src)
- if(!A.air_doors_activated)
- A.air_doors_activated = 1
- for(var/obj/machinery/door/E in A.all_doors)
- if(istype(E,/obj/machinery/door/firedoor))
- if(!E:blocked)
- if(E.operating)
- E:nextstate = CLOSED
- else if(!E.density)
- spawn(0)
- E.close()
- continue
-
-/obj/machinery/alarm/proc/air_doors_open(manual)
- var/area/A = get_area(loc)
- if(A.air_doors_activated)
- A.air_doors_activated = 0
- for(var/obj/machinery/door/E in A.all_doors)
- if(istype(E, /obj/machinery/door/firedoor))
- if(!E:blocked)
- if(E.operating)
- E:nextstate = OPEN
- else if(E.density)
- spawn(0)
- E.open()
- continue
-
///////////////
//END HACKING//
///////////////
diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index 65f6fb7b09d..2ffa9301dd7 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -445,12 +445,12 @@ update_flag
else
logmsg = "Valve was opened by [usr] ([usr.ckey]), starting the transfer into the air
"
if(air_contents.toxins > 0)
- message_admins("[key_name_admin(usr)] opened a canister that contains plasma! (JMP)")
- log_admin("[key_name(usr)] opened a canister that contains plasma at [x], [y], [z]")
+ message_admins("[key_name_admin(usr)] opened a canister that contains plasma in [get_area(src)]! (JMP)")
+ log_admin("[key_name(usr)] opened a canister that contains plasma at [get_area(src)]: [x], [y], [z]")
var/datum/gas/sleeping_agent = locate(/datum/gas/sleeping_agent) in air_contents.trace_gases
if(sleeping_agent && (sleeping_agent.moles > 1))
- message_admins("[key_name_admin(usr)] opened a canister that contains N2O! (JMP)")
- log_admin("[key_name(usr)] opened a canister that contains N2O at [x], [y], [z]")
+ message_admins("[key_name_admin(usr)] opened a canister that contains N2O in [get_area(src)]! (JMP)")
+ log_admin("[key_name(usr)] opened a canister that contains N2O at [get_area(src)]: [x], [y], [z]")
investigate_log(logmsg, "atmos")
release_log += logmsg
valve_open = !valve_open
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index e52cf428fd3..6ae47a3042d 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -142,7 +142,7 @@
if(do_after(user, 14.4, target = src))
files.AddDesign2Known(D.blueprint)
busy = 0
- else
+ else
to_chat(user, "That disk does not have a design on it!")
return 1
else
@@ -298,6 +298,9 @@
desc = initial(desc)
/obj/machinery/autolathe/proc/can_build(var/datum/design/D,var/multiplier=1,var/custom_metal,var/custom_glass)
+ if(D.make_reagents.len)
+ return 0
+
var/coeff = get_coeff(D)
var/metal_amount = materials.amount(MAT_METAL)
diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm
deleted file mode 100644
index 6344dec7bbf..00000000000
--- a/code/game/machinery/biogenerator.dm
+++ /dev/null
@@ -1,389 +0,0 @@
-/obj/machinery/biogenerator
- name = "biogenerator"
- desc = "Converts plants into biomass, which can be used to construct useful items."
- icon = 'icons/obj/biogenerator.dmi'
- icon_state = "biogen-empty"
- density = 1
- anchored = 1
- use_power = 1
- idle_power_usage = 40
- var/processing = 0
- var/obj/item/weapon/reagent_containers/glass/beaker = null
- var/points = 0
- var/in_beaker = 1
- var/menustat = "menu"
- var/efficiency = 0
- var/productivity = 0
- var/max_items = 40
-
-/obj/machinery/biogenerator/New()
- ..()
- create_reagents(1000)
- component_parts = list()
- component_parts += new /obj/item/weapon/circuitboard/biogenerator(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)
- component_parts += new /obj/item/stack/cable_coil(null, 1)
- RefreshParts()
-
-/obj/machinery/biogenerator/upgraded/New()
- ..()
- component_parts = list()
- component_parts += new /obj/item/weapon/circuitboard/biogenerator(null)
- component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null)
- component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(null)
- component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
- component_parts += new /obj/item/stack/cable_coil(null, 1)
- RefreshParts()
-
-/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()
-
-/obj/machinery/biogenerator/update_icon()
- if(panel_open)
- icon_state = "biogen-empty-o"
- else if(!src.beaker)
- icon_state = "biogen-empty"
- else if(!src.processing)
- icon_state = "biogen-stand"
- else
- icon_state = "biogen-work"
- return
-
-/obj/machinery/biogenerator/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
- if(istype(O, /obj/item/weapon/reagent_containers/glass) && !panel_open)
- if(beaker)
- to_chat(user, "A container is already loaded into the machine.")
- return
- else
- if(!user.drop_item())
- to_chat(user, "\The [O] is stuck to you!")
- return
- O.forceMove(src)
- beaker = O
- to_chat(user, "You add the container to the machine.")
- updateUsrDialog()
- update_icon()
- return
-
- if(!processing)
- if(default_deconstruction_screwdriver(user, "biogen-empty-o", "biogen-empty", O))
- if(beaker)
- var/obj/item/weapon/reagent_containers/glass/B = beaker
- B.forceMove(loc)
- beaker = null
- return
-
- if(exchange_parts(user, O))
- return
-
- else if(istype(O, /obj/item/weapon/crowbar))
- else if(panel_open)
- to_chat(user, "Close the maintenance panel first.")
- else if(processing)
- to_chat(user, "The biogenerator is currently processing.")
- else if(istype(O, /obj/item/weapon/storage/bag/plants))
- var/obj/item/weapon/storage/bag/plants/PB = O
- var/i = 0
- for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents)
- i++
- if(i >= max_items)
- to_chat(user, "The biogenerator is already full! Activate it.")
- else
- for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in PB.contents)
- if(i >= max_items)
- break
- PB.remove_from_storage(G, src)
- i++
- if(i < max_items)
- to_chat(user, "You empty the plant bag into the biogenerator.")
- else if(O.contents.len == 0)
- to_chat(user, "You empty the plant bag into the biogenerator, filling it to its capacity.")
- else
- to_chat(user, "You fill the biogenerator to its capacity.")
-
- else if(!istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown) && !istype(O, /obj/item/weapon/crowbar))
- to_chat(user, "You can not put this in [src.name]")
- else
- var/i = 0
- for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents)
- i++
- if(i >= max_items)
- to_chat(user, "The biogenerator is full! Activate it.")
- else
- user.unEquip(O)
- O.forceMove(src)
- to_chat(user, "You put [O.name] in [src.name]")
-
-
- default_deconstruction_crowbar(O)
-
- update_icon()
- return
-
-/obj/machinery/biogenerator/interact(mob/user as mob)
- if(stat & BROKEN || panel_open)
- return
- user.set_machine(src)
- var/dat
- if(processing)
- dat += "Biogenerator is processing! Please wait...
"
- else
- switch(menustat)
- if("nopoints")
- dat += "You do not have sufficient biomass to create products.
Please put growns into the reactor and activate it.
"
- menustat = "menu"
- if("complete")
- dat += "Operation complete.
"
- menustat = "menu"
- if("void")
- dat += "Error: No growns inside.
Please put growns into reactor.
"
- menustat = "menu"
- if("nobeakerspace")
- dat += "Not enough space left in container. Unable to create product.
"
- menustat = "menu"
- if(beaker)
- dat += "Biomass: [points] units.
"
- dat += "ActivateDetach Container
"
- dat += "Put fertilizer in: [in_beaker ? "Beaker" : "Bottle"]"
- dat += "Food:
"
- dat += ""
- dat += "10 milk:
Make ([20/efficiency])
"
- dat += "10 cream:
Make ([30/efficiency])
"
- dat += "Monkey cube:
Make ([250/efficiency])"
- dat += "
Nutrients:
"
- dat += ""
- dat += "E-Z-Nutrient:
Makex5 ([10/efficiency])
"
- dat += "Left 4 Zed:
Makex5 ([20/efficiency])
"
- dat += "Robust Harvest:
Makex5 ([25/efficiency])
"
- dat += "
Leather:
"
- dat += ""
- dat += "Wallet:
Make ([100/efficiency])
"
- dat += "Book bag:
Make ([200/efficiency])
"
- dat += "Plant bag:
Make ([200/efficiency])
"
- dat += "Rag:
Make ([200/efficiency])
"
- dat += "Mining satchel:
Make ([200/efficiency])
"
- dat += "Chemistry bag:
Make ([200/efficiency])
"
- dat += "Botanical gloves:
Make ([250/efficiency])
"
- dat += "Leather Satchel:
Make ([400/efficiency])
"
- dat += "Cash Bag:
Make ([400/efficiency])
"
- dat += "Leather Jacket:
Make ([500/efficiency])
"
- dat += "
Belts
"
- dat += ""
- dat += "Utility belt:
Make ([300/efficiency])
"
- dat += "Botanist belt:
Make ([300/efficiency])
"
- dat += "Security belt:
Make ([300/efficiency])
"
- dat += "Medical belt:
Make ([300/efficiency])
"
- dat += "Janitor belt:
Make ([300/efficiency])
"
- dat += "Bandolier:
Make ([300/efficiency])
"
- dat += "
Other:
"
- //dat += "Monkey: Make ([400/efficiency])
"
- else
- dat += "No container inside. Please insert a container.
"
-
- var/datum/browser/popup = new(user, "biogen", name, 350, 520)
- popup.set_content(dat)
- popup.open()
- return
-
-/obj/machinery/biogenerator/attack_hand(mob/user as mob)
- interact(user)
-
-/obj/machinery/biogenerator/proc/activate()
- if(usr.stat != 0)
- return
- if(src.stat != 0) //NOPOWER etc
- return
- if(src.processing)
- to_chat(usr, "The biogenerator is in the process of working.")
- return
- var/S = 0
- for(var/obj/item/weapon/reagent_containers/food/snacks/grown/I in contents)
- S += 5
- var/reagent_amount = I.reagents.get_reagent_amount("nutriment") + I.reagents.get_reagent_amount("plantmatter")
- if(reagent_amount < 0.1)
- points += 1*productivity
- else points += reagent_amount*10*productivity
- qdel(I)
- if(S)
- processing = 1
- update_icon()
- updateUsrDialog()
- playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
- use_power(S*30)
- sleep(S+15/productivity)
- processing = 0
- update_icon()
- else
- menustat = "void"
- return
-
-/obj/machinery/biogenerator/proc/check_cost(var/cost, var/checkonly)
- if(cost > points)
- menustat = "nopoints"
- return 1
- else if(checkonly)
- return 0
- else
- points -= cost
- processing = 1
- update_icon()
- updateUsrDialog()
- return 0
-
-/obj/machinery/biogenerator/proc/check_container_volume(var/reagent_amount)
- if(beaker.reagents.total_volume + reagent_amount > beaker.reagents.maximum_volume)
- menustat = "nobeakerspace"
- return 1
-
-/obj/machinery/biogenerator/proc/create_product(var/create)
- switch(create)
- //Food
- if("milk")
- if(check_container_volume(10)) return 0
- else if(check_cost(20/efficiency)) return 0
- else beaker.reagents.add_reagent("milk",10)
- if("cream")
- if(check_container_volume(10)) return 0
- else if(check_cost(30/efficiency)) return 0
- else beaker.reagents.add_reagent("cream",10)
- if("meat")
- if(check_cost(250/efficiency)) return 0
- else new/obj/item/weapon/reagent_containers/food/snacks/monkeycube(src.loc)
- //Nutrients
- if("ez")
- if(check_cost(10/efficiency, 1)) return 0
- if(in_beaker)
- if(check_container_volume(10)) return 0
- else beaker.reagents.add_reagent("eznutrient",10)
- else
- new/obj/item/weapon/reagent_containers/glass/bottle/fertilizer/ez(src.loc)
- if(check_cost(10/efficiency)) return 0
- if("l4z")
- if(check_cost(20/efficiency, 1)) return 0
- if(in_beaker)
- if(check_container_volume(10)) return 0
- else beaker.reagents.add_reagent("left4zed",10)
- else
- new/obj/item/weapon/reagent_containers/glass/bottle/fertilizer/l4z(src.loc)
- if(check_cost(20/efficiency)) return 0
- if("rh")
- if(check_cost(25/efficiency, 1)) return 0
- if(in_beaker)
- if(check_container_volume(10)) return 0
- else beaker.reagents.add_reagent("robustharvest",10)
- else
- new/obj/item/weapon/reagent_containers/glass/bottle/fertilizer/rh(src.loc)
- if(check_cost(25/efficiency)) return 0
- //Leather
- if("wallet")
- if(check_cost(100/efficiency)) return 0
- else new/obj/item/weapon/storage/wallet(src.loc)
- if("bkbag")
- if(check_cost(200/efficiency)) return 0
- else new/obj/item/weapon/storage/bag/books(src.loc)
- if("ptbag")
- if(check_cost(200/efficiency)) return 0
- else new/obj/item/weapon/storage/bag/plants(src.loc)
- 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("rag")
- if(check_cost(200/efficiency)) return 0
- else new/obj/item/weapon/reagent_containers/glass/rag(src.loc)
- if("gloves")
- if(check_cost(250/efficiency)) return 0
- else new/obj/item/clothing/gloves/botanic_leather(src.loc)
- if("satchel")
- if(check_cost(400/efficiency)) return 0
- else new/obj/item/weapon/storage/backpack/satchel(src.loc)
- if("cashbag")
- if(check_cost(400/efficiency)) return 0
- else new/obj/item/weapon/storage/bag/cash(src.loc)
- if("jacket")
- if(check_cost(500/efficiency)) return 0
- else new/obj/item/clothing/suit/jacket/leather(src.loc)
- //Belts
- if("tbelt")
- if(check_cost(300/efficiency)) return 0
- else new/obj/item/weapon/storage/belt/utility(src.loc)
- if("bbelt")
- if(check_cost(300/efficiency)) return 0
- else new/obj/item/weapon/storage/belt/botany(src.loc)
- if("sbelt")
- if(check_cost(300/efficiency)) return 0
- else new/obj/item/weapon/storage/belt/security(src.loc)
- if("mbelt")
- if(check_cost(300/efficiency)) return 0
- else new/obj/item/weapon/storage/belt/medical(src.loc)
- if("jbelt")
- if(check_cost(300/efficiency)) return 0
- else new/obj/item/weapon/storage/belt/janitor(src.loc)
- if("band")
- if(check_cost(300/efficiency)) return 0
- else new/obj/item/weapon/storage/belt/bandolier(src.loc)
- processing = 0
- menustat = "complete"
- update_icon()
- return 1
-
-/obj/machinery/biogenerator/proc/detach()
- if(beaker)
- beaker.forceMove(src.loc)
- beaker = null
- update_icon()
-
-/obj/machinery/biogenerator/Topic(href, href_list)
- if(..() || panel_open)
- return 1
-
- usr.set_machine(src)
-
- if(href_list["activate"])
- activate()
- updateUsrDialog()
-
- else if(href_list["detach"])
- detach()
- updateUsrDialog()
-
- else if(href_list["create"])
- var/amount = (text2num(href_list["amount"]))
- var/i = amount
- var/C = href_list["create"]
- if(i <= 0)
- return
- while(i >= 1)
- create_product(C)
- i--
- processing = 0
- updateUsrDialog()
-
- else if(href_list["menu"])
- menustat = "menu"
- updateUsrDialog()
-
- else if(href_list["inbeaker"])
- in_beaker = !in_beaker
- updateUsrDialog()
\ No newline at end of file
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index c131652a69a..8ba7558d69b 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -103,10 +103,7 @@
//TO-DO: Make the genetics machine accept them.
/obj/item/weapon/disk/data
name = "Cloning Data Disk"
- icon = 'icons/obj/cloning.dmi'
icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk.
- item_state = "card-id"
- w_class = 1
var/datum/dna2/record/buf=null
var/read_only = 0 //Well,it's still a floppy disk
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 0c09bc5f2c5..71aad1085ff 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -39,6 +39,10 @@
name = "Circuit board (Camera Monitor)"
build_path = /obj/machinery/computer/security
origin_tech = "programming=2"
+/obj/item/weapon/circuitboard/xenobiology
+ name = "Circuit board (Xenobiology Console)"
+ build_path = /obj/machinery/computer/camera_advanced/xenobio
+ origin_tech = "programming=3;biotech=3"
/obj/item/weapon/circuitboard/aicore
name = "Circuit board (AI Core)"
origin_tech = "programming=4;biotech=2"
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 1634ebdc4a0..2a11b4a8836 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -369,7 +369,7 @@ What a mess.*/
var/counter = 1
while(active2.fields[text("com_[]", counter)])
counter++
- active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], 2557
[t1]")
+ active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [worldtime2text()]
[t1]")
if("Delete Record (ALL)")
if(active1)
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index d7384290164..70f0195ce5d 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -230,6 +230,7 @@ to destroy them and players will be able to make replacements.
var/list/names_paths = list("Booze-O-Mat" = /obj/machinery/vending/boozeomat,
"Solar's Best Hot Drinks" = /obj/machinery/vending/coffee,
"Getmore Chocolate Corp" = /obj/machinery/vending/snack,
+ "Mr. Chang" = /obj/machinery/vending/chinese,
"Robust Softdrinks" = /obj/machinery/vending/cola,
"ShadyCigs Deluxe" = /obj/machinery/vending/cigarette,
"AutoDrobe" = /obj/machinery/vending/autodrobe,
@@ -334,14 +335,37 @@ to destroy them and players will be able to make replacements.
/obj/item/stack/cable_coil = 1,
/obj/item/weapon/stock_parts/console_screen = 1)
+/obj/item/weapon/circuitboard/plantgenes
+ name = "Plant DNA Manipulator (Machine Board)"
+ build_path = /obj/machinery/plantgenes
+ board_type = "machine"
+ origin_tech = "programming=3;biotech=3"
+ frame_desc = "Requires 1 Manipulator, 1 Micro Laser, 1 Console Screen, and 1 Scanning Module."
+ req_components = list(
+ /obj/item/weapon/stock_parts/manipulator = 1,
+ /obj/item/weapon/stock_parts/micro_laser = 1,
+ /obj/item/weapon/stock_parts/console_screen = 1,
+ /obj/item/weapon/stock_parts/scanning_module = 1)
+
+/obj/item/weapon/circuitboard/seed_extractor
+ name = "circuit board (Seed Extractor)"
+ build_path = /obj/machinery/seed_extractor
+ board_type = "machine"
+ origin_tech = "programming=1"
+ frame_desc = "Requires 1 Matter Bin and 1 Manipulator."
+ req_components = list(
+ /obj/item/weapon/stock_parts/matter_bin = 1,
+ /obj/item/weapon/stock_parts/manipulator = 1)
+
/obj/item/weapon/circuitboard/hydroponics
name = "circuit board (Hydroponics Tray)"
- build_path = /obj/machinery/portable_atmospherics/hydroponics
+ build_path = /obj/machinery/hydroponics/constructable
board_type = "machine"
origin_tech = "programming=1;biotech=1"
- frame_desc = "Requires 2 Matter Bins and 1 Console Screen."
+ frame_desc = "Requires 2 Matter Bins, 1 Manipulator, and 1 Console Screen."
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 2,
+ /obj/item/weapon/stock_parts/manipulator = 1,
/obj/item/weapon/stock_parts/console_screen = 1)
/obj/item/weapon/circuitboard/microwave
@@ -733,6 +757,17 @@ obj/item/weapon/circuitboard/rdserver
/obj/item/stack/cable_coil = 1,
/obj/item/weapon/stock_parts/console_screen = 1)
+/obj/item/weapon/circuitboard/quantumpad
+ name = "circuit board (Quantum Pad)"
+ build_path = /obj/machinery/quantumpad
+ board_type = "machine"
+ origin_tech = "programming=3;engineering=3;plasmatech=3;bluespace=4"
+ frame_desc = "Requires 1 Bluespace Crystal, 1 Capacitor, 1 piece of cable and 1 Manipulator."
+ req_components = list(
+ /obj/item/weapon/ore/bluespace_crystal = 1,
+ /obj/item/weapon/stock_parts/capacitor = 1,
+ /obj/item/weapon/stock_parts/manipulator = 1,
+ /obj/item/stack/cable_coil = 1)
/obj/item/weapon/circuitboard/sleeper
name = "circuit board (Sleeper)"
@@ -925,26 +960,6 @@ obj/item/weapon/circuitboard/rdserver
/obj/item/weapon/stock_parts/console_screen = 1,
/obj/item/stack/cable_coil = 1)
-/obj/item/weapon/circuitboard/botany_extractor
- name = "circuit board (Lysis-Isolation Centrifuge)"
- build_path = /obj/machinery/botany/extractor
- board_type = "machine"
- origin_tech = "biotech=3;programming=3"
- req_components = list(
- /obj/item/weapon/stock_parts/matter_bin = 1,
- /obj/item/weapon/stock_parts/scanning_module = 1,
- /obj/item/weapon/stock_parts/console_screen = 1)
-
-/obj/item/weapon/circuitboard/botany_editor
- name = "circuit board (Bioballistic Delivery System)"
- build_path = /obj/machinery/botany/editor
- board_type = "machine"
- origin_tech = "biotech=3;programming=3"
- req_components = list(
- /obj/item/weapon/stock_parts/matter_bin = 1,
- /obj/item/weapon/stock_parts/manipulator = 1,
- /obj/item/weapon/stock_parts/console_screen = 1)
-
/obj/item/weapon/circuitboard/gameboard
name = "circuit board (Virtual Gameboard)"
build_path = /obj/machinery/gameboard
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 1d9e02f52a1..807d3caf261 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -290,6 +290,11 @@
continue
O.loc = src
+ for(var/obj/machinery/computer/cloning/cloner in machines)
+ for(var/datum/dna2/record/R in cloner.records)
+ if(occupant.mind == locate(R.mind))
+ cloner.records.Remove(R)
+
//Delete all items not on the preservation list.
var/list/items = src.contents
items -= occupant // Don't delete the occupant
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 09f4885dc07..ca4dddd92b0 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -1,9 +1,15 @@
+#define CONSTRUCTION_COMPLETE 0 //No construction done - functioning as normal
+#define CONSTRUCTION_PANEL_OPEN 1 //Maintenance panel is open, still functioning
+#define CONSTRUCTION_WIRES_EXPOSED 2 //Cover plate is removed, wires are available
+#define CONSTRUCTION_GUTTED 3 //Wires are removed, circuit ready to remove
+#define CONSTRUCTION_NOCIRCUIT 4 //Circuit board removed, can safely weld apart
+
/var/const/OPEN = 1
/var/const/CLOSED = 2
/obj/machinery/door/firedoor
- name = "Firelock"
- desc = "Apply crowbar"
+ name = "firelock"
+ desc = "Apply crowbar."
icon = 'icons/obj/doors/Doorfireglass.dmi'
icon_state = "door_open"
opacity = 0
@@ -11,47 +17,21 @@
heat_proof = 1
glass = 1
power_channel = ENVIRON
-
- var/list/areas_added
-
- var/blocked = 0
- var/nextstate = null
-
- var/logged_users
closed_layer = 3.11
-/obj/machinery/door/firedoor/New()
- . = ..()
- for(var/obj/machinery/door/firedoor/F in loc)
- if(F != src)
- spawn(1)
- qdel(src)
- return .
-
- var/area/A = get_area(src)
- ASSERT(istype(A))
-
- A.all_doors.Add(src)
- areas_added = list(A)
-
- for(var/direction in cardinal)
- A = get_area(get_step(src,direction))
- if(istype(A) && !(A in areas_added))
- A.all_doors.Add(src)
- areas_added += A
-
-
-/obj/machinery/door/firedoor/Destroy()
- for(var/area/A in areas_added)
- A.all_doors.Remove(src)
- . = ..()
+ var/assembly_type = /obj/structure/firelock_frame
+ var/nextstate = null
+ var/welded = 0
+ var/boltslocked = 1
+ var/can_deconstruct = 1
/obj/machinery/door/firedoor/Bumped(atom/AM)
- if(p_open || operating) return
- if(!density) return ..()
+ if(p_open || operating)
+ return
+ if(!density)
+ return ..()
return 0
-
/obj/machinery/door/firedoor/power_change()
if(powered(power_channel))
stat &= ~NOPOWER
@@ -60,154 +40,74 @@
stat |= NOPOWER
return
-/obj/machinery/door/firedoor/attack_hand(mob/user as mob)
- return attackby(null, user)
-
/obj/machinery/door/firedoor/attackby(obj/item/weapon/C as obj, mob/user as mob, params)
add_fingerprint(user)
+
if(operating)
- return//Already doing something.
+ return
if(istype(C, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/W = C
if(W.remove_fuel(0, user))
- blocked = !blocked
- user.visible_message("\red \The [user] [blocked ? "welds" : "unwelds"] \the [src] with \a [W].",\
- "You [blocked ? "weld" : "unweld"] \the [src] with \the [W].",\
- "You hear something being welded.")
+ welded = !welded
+ to_chat(user, "You [welded ? "welded" : "unwelded"] \the [src]")
update_icon()
return
- if(blocked)
- to_chat(user, "\red \The [src] is welded solid!")
- return
-
- var/area/A = get_area_master(src)
- ASSERT(istype(A)) // This worries me.
- var/alarmed = A.air_doors_activated || A.fire
-
- if( istype(C, /obj/item/weapon/crowbar) || ( istype(C,/obj/item/weapon/twohanded/fireaxe) && C:wielded == 1 ) )
- if(operating)
+ if(welded)
+ if(istype(C, /obj/item/weapon/wrench))
+ if(boltslocked)
+ to_chat(user, "There are screws locking the bolts in place!")
+ return
+ playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
+ user.visible_message("[user] starts undoing [src]'s bolts...", \
+ "You start unfastening [src]'s floor bolts...")
+ if(!do_after(user, 50, target = src))
+ return
+ playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+ user.visible_message("[user] unfastens [src]'s bolts.", \
+ "You undo [src]'s floor bolts.")
+ deconstruct(TRUE)
+ return
+ else if(istype(C, /obj/item/weapon/screwdriver))
+ user.visible_message("[user] [boltslocked ? "unlocks" : "locks"] [src]'s bolts...", \
+ "You [boltslocked ? "unlock" : "lock"] [src]'s floor bolts...")
+ playsound(get_turf(src), 'sound/items/Screwdriver.ogg', 50, 1)
+ boltslocked = !boltslocked
+ return
+ else
+ to_chat(user, "\The [src] is welded solid!")
return
- if(blocked)
- user.visible_message("\red \The [user] pries at \the [src] with \a [C], but \the [src] is welded in place!",\
- "You try to pry \the [src] [density ? "open" : "closed"], but it is welded in place!",\
- "You hear someone struggle and metal straining.")
- if(stat & (BROKEN|NOPOWER) || !density || !alarmed)
- user.visible_message("\red \The [user] forces \the [src] [density ? "open" : "closed"] with \a [C]!",\
- "You force \the [src] [density ? "open" : "closed"] with \the [C]!",\
- "You hear metal strain, and a door [density ? "open" : "close"].")
-
- else if(allowed(user))
- user.visible_message("\blue \The [user] lifts \the [src] with \a [C].",\
- "\The [src] scans your ID, and obediently opens as you apply your [C].",\
- "You hear metal move, and a door [density ? "open" : "close"].")
+ if(istype(C, /obj/item/weapon/crowbar) || istype(C, /obj/item/weapon/twohanded/fireaxe))
+ if(istype(C, /obj/item/weapon/twohanded/fireaxe))
+ var/obj/item/weapon/twohanded/fireaxe/F = C
+ if(!F.wielded)
+ return
if(density)
- spawn(0)
- open()
- else
- spawn(0)
- close()
- return
-
- var/access_granted = 0
- var/users_name
- if(!istype(C, /obj)) //If someone hit it with their hand. We need to see if they are allowed.
- if(allowed(user))
- access_granted = 1
- if(ishuman(user))
- users_name = FindNameFromID(user)
- else
- users_name = "Unknown"
-
- if(ishuman(user) && !stat && (istype(C, /obj/item/weapon/card/id) || istype(C, /obj/item/device/pda)))
- var/obj/item/weapon/card/id/ID = C
-
- if( istype(C, /obj/item/device/pda) )
- var/obj/item/device/pda/pda = C
- ID = pda.id
- if(!istype(ID))
- ID = null
-
- if(ID)
- users_name = ID.registered_name
-
- if(check_access(ID))
- access_granted = 1
-
- var/answer = alert(user, "Are you sure you want to [density ? "open" : "close"] \the [src]?","\The [src] confirmation","Yes","No")
- if(answer == "No")
- return
-
- if(user.stat || user.stunned || user.weakened || user.paralysis || get_dist(src, user) > 1)
- to_chat(user, "Sorry, you must remain able bodied and close to \the [src] in order to use it.")
- return
-
- if(alarmed && density && !access_granted)
- to_chat(user, "Access denied. Please wait for authorities to arrive, or for the alert to clear.")
- return
-
- else
- user.visible_message("\blue \The [src] [density ? "open" : "close"]s for \the [user].",\
- "\The [src] [density ? "open" : "close"]s.",\
- "You hear a beep, and a door opening.")
- // Accountability!
- if(!logged_users)
- logged_users = list()
- logged_users += users_name
-
- var/needs_to_close = 0
- if(density)
- if(alarmed)
- needs_to_close = 1
- spawn()
open()
- else
- spawn()
+ else
close()
- if(needs_to_close)
- spawn(50)
- if(alarmed)
- nextstate = CLOSED
-
-/obj/machinery/door/firedoor/attack_ai(mob/user as mob)
- if(operating || stat & NOPOWER)
- return //Already doing something or depowered.
-
- if(blocked)
- to_chat(user, "\red \The [src] is welded solid!")
+/obj/machinery/door/firedoor/attack_hand(mob/user)
+ add_fingerprint(user)
+ if(welded || operating || stat & NOPOWER)
return
-
- var/area/A = get_area_master(src)
- ASSERT(istype(A)) // This worries me.
- var/alarmed = A.air_doors_activated || A.fire
-
- var/access_granted = 0
- if(isAI(user) || isrobot(user))
- access_granted = 1
-
- if(access_granted == 1)
- user.visible_message("\blue \The [src] [density ? "open" : "close"]s for \the [user].",\
- "\The [src] [density ? "open" : "close"]s.",\
- "You hear a beep, and a door opening.")
-
- var/needs_to_close = 0
if(density)
- if(alarmed)
- needs_to_close = 1
- spawn()
- open()
+ open()
else
- spawn()
- close()
+ close()
+
+/obj/machinery/door/firedoor/attack_ai(mob/user)
+ attack_hand(user)
- if(needs_to_close)
- spawn(50)
- if(alarmed)
- nextstate = CLOSED
+/obj/machinery/door/firedoor/attack_alien(mob/user)
+ add_fingerprint(user)
+ if(welded)
+ to_chat(user, "[src] refuses to budge!")
+ return
+ open()
/obj/machinery/door/firedoor/do_animate(animation)
switch(animation)
@@ -215,32 +115,25 @@
flick("door_opening", src)
if("closing")
flick("door_closing", src)
- return
/obj/machinery/door/firedoor/update_icon()
overlays.Cut()
if(density)
icon_state = "door_closed"
- if(blocked)
+ if(welded)
overlays += "welded"
else
icon_state = "door_open"
- if(blocked)
+ if(welded)
overlays += "welded_open"
- return
/obj/machinery/door/firedoor/open()
- ..()
+ . = ..()
latetoggle()
- return
/obj/machinery/door/firedoor/close()
- ..()
- if(locate(/mob/living) in get_turf(src))
- open()
- return
+ . = ..()
latetoggle()
- return
/obj/machinery/door/firedoor/proc/latetoggle()
if(operating || stat & NOPOWER || !nextstate)
@@ -252,23 +145,30 @@
if(CLOSED)
nextstate = null
close()
- return
-
-
-/obj/machinery/door/firedoor/border_only
+
+/obj/machinery/door/firedoor/proc/deconstruct(disassembled = TRUE)
+ if(can_deconstruct)
+ var/obj/structure/firelock_frame/F = new assembly_type(get_turf(src))
+ if(disassembled)
+ F.constructionStep = CONSTRUCTION_PANEL_OPEN
+ else
+ F.constructionStep = CONSTRUCTION_WIRES_EXPOSED
+ F.update_icon()
+ qdel(src)
+
+/obj/machinery/door/firedoor/border_only
icon = 'icons/obj/doors/edge_Doorfire.dmi'
flags = ON_BORDER
-/obj/machinery/door/firedoor/border_only/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+/obj/machinery/door/firedoor/border_only/CanPass(atom/movable/mover, turf/target, height=0)
if(istype(mover) && mover.checkpass(PASSGLASS))
return 1
if(get_dir(loc, target) == dir) //Make sure looking at appropriate border
- if(air_group) return 0
return !density
else
return 1
-/obj/machinery/door/firedoor/border_only/CheckExit(atom/movable/mover as mob|obj, turf/target as turf)
+/obj/machinery/door/firedoor/border_only/CheckExit(atom/movable/mover as mob|obj, turf/target)
if(istype(mover) && mover.checkpass(PASSGLASS))
return 1
if(get_dir(loc, target) == dir)
@@ -276,8 +176,222 @@
else
return 1
-/obj/machinery/door/firedoor/border_only/CanAtmosPass(var/turf/T)
+/obj/machinery/door/firedoor/border_only/CanAtmosPass(turf/T)
if(get_dir(loc, T) == dir)
return !density
else
- return 1
\ No newline at end of file
+ return 1
+
+/obj/machinery/door/firedoor/heavy
+ name = "heavy firelock"
+ icon = 'icons/obj/doors/Doorfire.dmi'
+ glass = 0
+ opacity = 1
+ assembly_type = /obj/structure/firelock_frame/heavy
+
+/obj/machinery/door/firedoor/heavy/ex_act(severity)
+ switch(severity)
+ if(1.0)
+ qdel(src)
+
+/obj/item/weapon/firelock_electronics
+ name = "firelock electronics"
+ icon = 'icons/obj/doors/door_assembly.dmi'
+ icon_state = "door_electronics"
+ desc = "A circuit board used in construction of firelocks."
+ w_class = 2
+ materials = list(MAT_METAL=50, MAT_GLASS=50)
+
+/obj/structure/firelock_frame
+ name = "firelock frame"
+ desc = "A partially completed firelock."
+ icon = 'icons/obj/doors/Doorfire.dmi'
+ icon_state = "frame1"
+ anchored = 0
+ density = 1
+ var/constructionStep = CONSTRUCTION_NOCIRCUIT
+ var/reinforced = 0
+
+/obj/structure/firelock_frame/heavy
+ name = "heavy firelock frame"
+ reinforced = 1
+
+/obj/structure/firelock_frame/examine(mob/user)
+ ..()
+ switch(constructionStep)
+ if(CONSTRUCTION_PANEL_OPEN)
+ to_chat(user, "There is a small metal plate covering the wires.")
+ if(CONSTRUCTION_WIRES_EXPOSED)
+ to_chat(user, "Wires are trailing from the maintenance panel.")
+ if(CONSTRUCTION_GUTTED)
+ to_chat(user, "The circuit board is visible.")
+ if(CONSTRUCTION_NOCIRCUIT)
+ to_chat(user, "There are no electronics in the frame.")
+ if(reinforced)
+ to_chat(user, "The frame is reinforced.")
+
+/obj/structure/firelock_frame/update_icon()
+ ..()
+ icon_state = "frame[constructionStep]"
+
+/obj/structure/firelock_frame/attackby(obj/item/weapon/C, mob/user)
+ switch(constructionStep)
+ if(CONSTRUCTION_PANEL_OPEN)
+ if(istype(C, /obj/item/weapon/crowbar))
+ playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1)
+ user.visible_message("[user] starts prying something out from [src]...", \
+ "You begin prying out the wire cover...")
+ if(!do_after(user, 50, target = src))
+ return
+ if(constructionStep != CONSTRUCTION_PANEL_OPEN)
+ return
+ playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+ user.visible_message("[user] pries out a metal plate from [src], exposing the wires.", \
+ "You remove the cover plate from [src], exposing the wires.")
+ constructionStep = CONSTRUCTION_WIRES_EXPOSED
+ update_icon()
+ return
+ if(istype(C, /obj/item/weapon/wrench))
+ if(locate(/obj/machinery/door/firedoor) in get_turf(src))
+ to_chat(user, "There's already a firelock there.")
+ return
+ playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
+ user.visible_message("[user] starts bolting down [src]...", \
+ "You begin bolting [src]...")
+ if(!do_after(user, 30, target = src))
+ return
+ if(locate(/obj/machinery/door/firedoor) in get_turf(src))
+ return
+ user.visible_message("[user] finishes the firelock.", \
+ "You finish the firelock.")
+ playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+ if(reinforced)
+ new /obj/machinery/door/firedoor/heavy(get_turf(src))
+ else
+ new /obj/machinery/door/firedoor(get_turf(src))
+ qdel(src)
+ return
+ if(istype(C, /obj/item/stack/sheet/plasteel))
+ var/obj/item/stack/sheet/plasteel/P = C
+ if(reinforced)
+ to_chat(user, "[src] is already reinforced.")
+ return
+ if(P.get_amount() < 2)
+ to_chat(user, "You need more plasteel to reinforce [src].")
+ return
+ user.visible_message("[user] begins reinforcing [src]...", \
+ "You begin reinforcing [src]...")
+ playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+ if(do_after(user, 60, target = src))
+ if(constructionStep != CONSTRUCTION_PANEL_OPEN || reinforced || P.get_amount() < 2 || !P)
+ return
+ user.visible_message("[user] reinforces [src].", \
+ "You reinforce [src].")
+ playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+ P.use(2)
+ reinforced = 1
+ return
+
+ if(CONSTRUCTION_WIRES_EXPOSED)
+ if(istype(C, /obj/item/weapon/wirecutters))
+ playsound(get_turf(src), 'sound/items/Wirecutter.ogg', 50, 1)
+ user.visible_message("[user] starts cutting the wires from [src]...", \
+ "You begin removing [src]'s wires...")
+ if(!do_after(user, 60, target = src))
+ return
+ if(constructionStep != CONSTRUCTION_WIRES_EXPOSED)
+ return
+ user.visible_message("[user] removes the wires from [src].", \
+ "You remove the wiring from [src], exposing the circuit board.")
+ var/obj/item/stack/cable_coil/B = new(get_turf(src))
+ B.amount = 5
+ constructionStep = CONSTRUCTION_GUTTED
+ update_icon()
+ return
+ if(istype(C, /obj/item/weapon/weldingtool))
+ var/obj/item/weapon/weldingtool/W = C
+ if(W.remove_fuel(1, user))
+ playsound(get_turf(src), 'sound/items/Welder2.ogg', 50, 1)
+ user.visible_message("[user] starts welding a metal plate into [src]...", \
+ "You begin welding the cover plate back onto [src]...")
+ if(!do_after(user, 80, target = src))
+ return
+ if(constructionStep != CONSTRUCTION_WIRES_EXPOSED)
+ return
+ playsound(get_turf(src), 'sound/items/Welder2.ogg', 50, 1)
+ user.visible_message("[user] welds the metal plate into [src].", \
+ "You weld [src]'s cover plate into place, hiding the wires.")
+ constructionStep = CONSTRUCTION_PANEL_OPEN
+ update_icon()
+ return
+ if(CONSTRUCTION_GUTTED)
+ if(istype(C, /obj/item/weapon/crowbar))
+ user.visible_message("[user] begins removing the circuit board from [src]...", \
+ "You begin prying out the circuit board from [src]...")
+ playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1)
+ if(!do_after(user, 50, target = src))
+ return
+ if(constructionStep != CONSTRUCTION_GUTTED)
+ return
+ user.visible_message("[user] removes [src]'s circuit board.", \
+ "You remove the circuit board from [src].")
+ new /obj/item/weapon/firelock_electronics(get_turf(src))
+ playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1)
+ constructionStep = CONSTRUCTION_NOCIRCUIT
+ update_icon()
+ return
+ if(istype(C, /obj/item/stack/cable_coil))
+ var/obj/item/stack/cable_coil/B = C
+ if(B.get_amount() < 5)
+ to_chat(user, "You need more wires to add wiring to [src].")
+ return
+ user.visible_message("[user] begins wiring [src]...", \
+ "You begin adding wires to [src]...")
+ playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+ if(do_after(user, 60, target = src))
+ if(constructionStep != CONSTRUCTION_GUTTED || B.get_amount() < 5 || !B)
+ return
+ user.visible_message("[user] adds wires to [src].", \
+ "You wire [src].")
+ playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+ B.use(5)
+ constructionStep = CONSTRUCTION_WIRES_EXPOSED
+ update_icon()
+ return
+ if(CONSTRUCTION_NOCIRCUIT)
+ if(istype(C, /obj/item/weapon/weldingtool))
+ var/obj/item/weapon/weldingtool/W = C
+ if(W.remove_fuel(1,user))
+ playsound(get_turf(src), 'sound/items/Welder2.ogg', 50, 1)
+ user.visible_message("[user] begins cutting apart [src]'s frame...", \
+ "You begin slicing [src] apart...")
+ if(!do_after(user, 80, target = src))
+ return
+ if(constructionStep != CONSTRUCTION_NOCIRCUIT)
+ return
+ user.visible_message("[user] cuts apart [src]!", \
+ "You cut [src] into metal.")
+ playsound(get_turf(src), 'sound/items/Welder2.ogg', 50, 1)
+ var/turf/T = get_turf(src)
+ new /obj/item/stack/sheet/metal(T, 3)
+ if(reinforced)
+ new /obj/item/stack/sheet/plasteel(T, 2)
+ qdel(src)
+ return
+ if(istype(C, /obj/item/weapon/firelock_electronics))
+ user.visible_message("[user] starts adding [C] to [src]...", \
+ "You begin adding a circuit board to [src]...")
+ playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+ if(!do_after(user, 40, target = src))
+ return
+ if(constructionStep != CONSTRUCTION_NOCIRCUIT)
+ return
+ user.drop_item()
+ qdel(C)
+ user.visible_message("[user] adds a circuit to [src].", \
+ "You insert and secure [C].")
+ playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+ constructionStep = CONSTRUCTION_GUTTED
+ update_icon()
+ return
+ return ..()
\ No newline at end of file
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 41952adf355..aa345e29643 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -28,6 +28,7 @@ Possible to do for anyone motivated enough:
// 0 = RANGE BASED
// 1 = AREA BASED
var/const/HOLOPAD_MODE = 0
+var/list/holopads = list()
/obj/machinery/hologram/holopad
name = "\improper AI holopad"
@@ -42,6 +43,7 @@ var/const/HOLOPAD_MODE = 0
/obj/machinery/hologram/holopad/New()
..()
+ holopads += src
component_parts = list()
component_parts += new /obj/item/weapon/circuitboard/holopad(null)
component_parts += new /obj/item/weapon/stock_parts/capacitor(null)
@@ -89,13 +91,15 @@ var/const/HOLOPAD_MODE = 0
if(user.eyeobj.loc != src.loc)//Set client eye on the object if it's not already.
user.eyeobj.setLoc(get_turf(src))
else if(!hologram)//If there is no hologram, possibly make one.
- activate_holo(user)
+ activate_holo(user, 0)
else if(master == user)//If there is a hologram, remove it. But only if the user is the master. Otherwise do nothing.
clear_holo()
return
-/obj/machinery/hologram/holopad/proc/activate_holo(mob/living/silicon/ai/user)
- if(!(stat & NOPOWER) && user.eyeobj.loc == src.loc)//If the projector has power and client eye is on it.
+/obj/machinery/hologram/holopad/proc/activate_holo(mob/living/silicon/ai/user, var/force = 0)
+ if(!force && user.eyeobj.loc != src.loc) // allows holopads to pass off holograms to the next holopad in the chain
+ to_chat(user, "ERROR: Unable to project hologram.")
+ else if(!(stat & NOPOWER))//If the projector has power
if(user.holo)
var/obj/machinery/hologram/holopad/current = user.holo
current.clear_holo()
@@ -163,7 +167,17 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
if(eye_area != holo_area)
return 1
+ var/mob/living/silicon/ai/theai = master
+ var/turf/target_turf = get_turf(master.eyeobj)
+ var/newdir = hologram.dir
clear_holo()//If not, we want to get rid of the hologram.
+ var/obj/machinery/hologram/holopad/pad_close = get_closest_atom(/obj/machinery/hologram/holopad, holopads, theai.eyeobj)
+ if(get_dist(pad_close, theai.eyeobj) <= pad_close.holo_range)
+ if(!(pad_close.stat & NOPOWER) && !pad_close.hologram)
+ pad_close.activate_holo(theai, 1)
+ if(pad_close.hologram)
+ pad_close.hologram.forceMove(target_turf)
+ pad_close.hologram.dir = newdir
return 1
/obj/machinery/hologram/holopad/proc/move_hologram()
@@ -221,6 +235,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
return
/obj/machinery/hologram/holopad/Destroy()
+ holopads -= src
if(hologram)
clear_holo()
return ..()
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 4d41a591b9c..e62e54a3a78 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -396,9 +396,7 @@ Class Procs:
/obj/machinery/proc/default_deconstruction_crowbar(var/obj/item/weapon/crowbar/C, var/ignore_panel = 0)
if(istype(C) && (panel_open || ignore_panel))
playsound(loc, 'sound/items/Crowbar.ogg', 50, 1)
- var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(loc)
- M.state = 2
- M.icon_state = "box_1"
+ spawn_frame()
for(var/obj/item/I in component_parts)
if(I.reliability != 100 && crit_fail)
I.crit_fail = 1
@@ -407,6 +405,12 @@ Class Procs:
return 1
return 0
+
+/obj/machinery/proc/spawn_frame()
+ var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(loc)
+ M.state = 2
+ M.icon_state = "box_1"
+
/obj/machinery/proc/default_deconstruction_screwdriver(var/mob/user, var/icon_state_open, var/icon_state_closed, var/obj/item/weapon/screwdriver/S)
if(istype(S))
playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 17fe32f39ec..28b3cfe7132 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -20,7 +20,7 @@
var/health = 80 //the turret's health
var/locked = 1 //if the turret's behaviour control access is locked
var/controllock = 0 //if the turret responds to control panels
-
+
var/installation = /obj/item/weapon/gun/energy/gun/turret //the type of weapon installed
var/gun_charge = 0 //the charge of the gun inserted
var/projectile = null //holder for bullettype
@@ -56,6 +56,13 @@
var/screen = 0 // Screen 0: main control, screen 1: access levels
var/one_access = 0 // Determines if access control is set to req_one_access or req_access
+
+ var/syndicate = 0 //is the turret a syndicate turret?
+ var/faction = ""
+ var/emp_vulnerable = 1 // Can be empd
+ var/scan_range = 7
+ var/always_up = 0 //Will stay active
+ var/has_cover = 1 //Hides the cover
/obj/machinery/porta_turret/centcom
enabled = 0
@@ -99,7 +106,7 @@
one_access = 0
/obj/machinery/porta_turret/proc/setup()
- var/obj/item/weapon/gun/energy/E= new installation //All energy-based weapons are applicable
+ var/obj/item/weapon/gun/energy/E = new installation //All energy-based weapons are applicable
var/obj/item/ammo_casing/shottype = E.ammo_type[1]
projectile = shottype.projectile_type
@@ -206,10 +213,10 @@ var/list/turret_icons
data["screen"] = screen
data["locked"] = locked
data["enabled"] = enabled
- data["is_lethal"] = 1
+ data["lethal_control"] = !syndicate ? 1 : 0
data["lethal"] = lethal
- if(data["access"])
+ if(data["access"] && !syndicate)
var/settings[0]
settings[++settings.len] = list("category" = "Neutralize All Non-Synthetics", "setting" = "check_synth", "value" = check_synth)
settings[++settings.len] = list("category" = "Check Weapon Authorization", "setting" = "check_weapons", "value" = check_weapons)
@@ -219,18 +226,19 @@ var/list/turret_icons
settings[++settings.len] = list("category" = "Check Misc. Lifeforms", "setting" = "check_anomalies", "value" = check_anomalies)
data["settings"] = settings
- data["one_access"] = one_access
- var/accesses[0]
- var/list/access_list = get_all_accesses()
- for(var/access in access_list)
- var/name = get_access_desc(access)
- var/active
- if(one_access)
- active = (access in req_one_access)
- else
- active = (access in req_access)
- accesses[++accesses.len] = list("name" = name, "active" = active, "number" = access)
- data["accesses"] = accesses
+ if(!syndicate)
+ data["one_access"] = one_access
+ var/accesses[0]
+ var/list/access_list = get_all_accesses()
+ for(var/access in access_list)
+ var/name = get_access_desc(access)
+ var/active
+ if(one_access)
+ active = (access in req_one_access)
+ else
+ active = (access in req_access)
+ accesses[++accesses.len] = list("name" = name, "active" = active, "number" = access)
+ data["accesses"] = accesses
return data
/obj/machinery/porta_turret/proc/HasController()
@@ -259,6 +267,8 @@ var/list/turret_icons
var/value = text2num(href_list["value"])
if(href_list["command"] == "enable")
enabled = value
+ else if(syndicate)
+ return 1
else if(href_list["command"] == "screen")
screen = value
else if(href_list["command"] == "lethal")
@@ -276,11 +286,12 @@ var/list/turret_icons
else if(href_list["command"] == "check_anomalies")
check_anomalies = value
- if(href_list["one_access"])
- toggle_one_access(href_list["one_access"])
+ if(!syndicate)
+ if(href_list["one_access"])
+ toggle_one_access(href_list["one_access"])
- if(href_list["access"])
- toggle_access(href_list["access"])
+ if(href_list["access"])
+ toggle_access(href_list["access"])
return 1
@@ -311,7 +322,7 @@ var/list/turret_icons
req_access += required
/obj/machinery/porta_turret/power_change()
- if(powered())
+ if(powered() || !use_power)
stat &= ~NOPOWER
update_icon()
else
@@ -321,7 +332,7 @@ var/list/turret_icons
/obj/machinery/porta_turret/attackby(obj/item/I, mob/user)
- if(stat & BROKEN)
+ if((stat & BROKEN) && !syndicate)
if(istype(I, /obj/item/weapon/crowbar))
//If the turret is destroyed, you can remove it with a crowbar to
//try and salvage its components
@@ -438,13 +449,12 @@ var/list/turret_icons
return
health -= force
- if(force > 5 && prob(45))
+ if(force > 5 && prob(45) && spark_system)
spark_system.start()
if(health <= 0)
die() //the death process :(
/obj/machinery/porta_turret/bullet_act(obj/item/projectile/Proj)
-
if(Proj.damage_type == STAMINA)
return
@@ -461,7 +471,7 @@ var/list/turret_icons
take_damage(Proj.damage)
/obj/machinery/porta_turret/emp_act(severity)
- if(enabled)
+ if(enabled && emp_vulnerable)
//if the turret is on, the EMP no matter how severe disables the turret for a while
//and scrambles its settings, with a slight chance of having an emag effect
check_arrest = prob(50)
@@ -494,7 +504,8 @@ var/list/turret_icons
/obj/machinery/porta_turret/proc/die() //called when the turret dies, ie, health <= 0
health = 0
stat |= BROKEN //enables the BROKEN bit
- spark_system.start() //creates some sparks because they look cool
+ if(spark_system)
+ spark_system.start() //creates some sparks because they look cool
update_icon()
/obj/machinery/porta_turret/process()
@@ -503,35 +514,43 @@ var/list/turret_icons
set background = BACKGROUND_ENABLED
if(stat & (NOPOWER|BROKEN))
- //if the turret has no power or is broken, make the turret pop down if it hasn't already
- popDown()
+ if(!always_up)
+ //if the turret has no power or is broken, make the turret pop down if it hasn't already
+ popDown()
return
if(!enabled)
- //if the turret is off, make it pop down
- popDown()
+ if(!always_up)
+ //if the turret is off, make it pop down
+ popDown()
return
var/list/targets = list() //list of primary targets
var/list/secondarytargets = list() //targets that are least important
- for(var/obj/mecha/ME in view(7,src))
+ for(var/obj/mecha/ME in view(scan_range,src))
assess_and_assign(ME.occupant, targets, secondarytargets)
- for(var/obj/spacepod/SP in view(7,src))
+ for(var/obj/spacepod/SP in view(scan_range,src))
assess_and_assign(SP.pilot, targets, secondarytargets)
- for(var/obj/vehicle/T in view(7,src))
+ for(var/obj/vehicle/T in view(scan_range,src))
assess_and_assign(T.buckled_mob, targets, secondarytargets)
- for(var/mob/living/C in view(7,src)) //loops through all living lifeforms in view
+ for(var/mob/living/C in view(scan_range,src)) //loops through all living lifeforms in view
assess_and_assign(C, targets, secondarytargets)
if(!tryToShootAt(targets))
if(!tryToShootAt(secondarytargets)) // if no valid targets, go for secondary targets
- spawn()
- popDown() // no valid targets, close the cover
+ if(!always_up)
+ spawn()
+ popDown() // no valid targets, close the cover
+/obj/machinery/porta_turret/proc/in_faction(mob/living/target)
+ if(!(faction in target.faction))
+ return 0
+ return 1
+
/obj/machinery/porta_turret/proc/assess_and_assign(var/mob/living/L, var/list/targets, var/list/secondarytargets)
switch(assess_living(L))
if(TURRET_PRIORITY_TARGET)
@@ -552,17 +571,20 @@ var/list/turret_icons
if(!L)
return TURRET_NOT_TARGET
- if(!emagged && (issilicon(L) || isbot(L))) // Don't target silica
+ if(!emagged && !syndicate && (issilicon(L) || isbot(L))) // Don't target silica
return TURRET_NOT_TARGET
if(L.stat && !emagged) //if the perp is dead/dying, no need to bother really
return TURRET_NOT_TARGET //move onto next potential victim!
- if(get_dist(src, L) > 7) //if it's too far away, why bother?
+ if(get_dist(src, L) > scan_range) //if it's too far away, why bother?
return TURRET_NOT_TARGET
if(emagged) // If emagged not even the dead get a rest
return L.stat ? TURRET_SECONDARY_TARGET : TURRET_PRIORITY_TARGET
+
+ if(in_faction(L))
+ return TURRET_NOT_TARGET
if(lethal && locate(/mob/living/silicon/ai) in get_turf(L)) //don't accidentally kill the AI!
return TURRET_NOT_TARGET
@@ -648,18 +670,19 @@ var/list/turret_icons
return ..()
-/obj/machinery/porta_turret/proc/set_raised_raising(var/raised, var/raising)
- src.raised = raised
- src.raising = raising
- density = raised || raising
+/obj/machinery/porta_turret/proc/set_raised_raising(var/is_raised, var/is_raising)
+ raised = is_raised
+ raising = is_raising
+ density = is_raised || is_raising
/obj/machinery/porta_turret/proc/target(var/mob/living/target)
if(disabled)
return
if(target)
last_target = target
- spawn()
- popUp() //pop the turret up if it's not already up.
+ if(has_cover)
+ spawn()
+ popUp() //pop the turret up if it's not already up.
dir = get_dir(src, target) //even if you can't shoot, follow the target
spawn()
shootAt(target)
@@ -667,7 +690,7 @@ var/list/turret_icons
return
/obj/machinery/porta_turret/proc/shootAt(var/mob/living/target)
- if(!raised) //the turret has to be raised in order to fire - makes sense, right?
+ if(!raised && has_cover) //the turret has to be raised in order to fire - makes sense, right?
return
//any emagged turrets will shoot extremely fast! This not only is deadly, but drains a lot power!
if(!emagged) //if it hasn't been emagged, it has to obey a cooldown rate
@@ -719,9 +742,9 @@ var/list/turret_icons
/obj/machinery/porta_turret/proc/setState(var/datum/turret_checks/TC)
if(controllock)
return
- src.enabled = TC.enabled
- src.lethal = TC.lethal
- src.iconholder = TC.lethal
+ enabled = TC.enabled
+ lethal = TC.lethal
+ iconholder = TC.lethal
check_synth = TC.check_synth
check_access = TC.check_access
@@ -731,7 +754,7 @@ var/list/turret_icons
check_anomalies = TC.check_anomalies
ailock = TC.ailock
- src.power_change()
+ power_change()
/*
Portable turret constructions
@@ -944,3 +967,87 @@ var/list/turret_icons
/atom/movable/porta_turret_cover
icon = 'icons/obj/turrets.dmi'
+
+// Syndicate turrets
+/obj/machinery/porta_turret/syndicate
+ projectile = /obj/item/projectile/bullet
+ eprojectile = /obj/item/projectile/bullet
+ shot_sound = 'sound/weapons/Gunshot.ogg'
+ eshot_sound = 'sound/weapons/Gunshot.ogg'
+
+ icon_state = "syndieturret0"
+ var/icon_state_initial = "syndieturret0"
+ var/icon_state_active = "syndieturret1"
+ var/icon_state_destroyed = "syndieturret2"
+
+ syndicate = 1
+ installation = null
+ always_up = 1
+ use_power = 0
+ has_cover = 0
+ raised = 1
+ scan_range = 9
+
+ faction = "syndicate"
+ emp_vulnerable = 0
+
+ lethal = 1
+ check_arrest = 0
+ check_records = 0
+ check_weapons = 0
+ check_access = 0
+ check_anomalies = 1
+ check_synth = 1
+ ailock = 1
+
+/obj/machinery/porta_turret/syndicate/New()
+ ..()
+ if(req_one_access && req_one_access.len)
+ req_one_access.Cut()
+ req_access = list(access_syndicate)
+ one_access = 0
+
+/obj/machinery/porta_turret/syndicate/update_icon()
+ if(stat & BROKEN)
+ icon_state = icon_state_destroyed
+ else if(enabled)
+ icon_state = icon_state_active
+ else
+ icon_state = icon_state_initial
+
+/obj/machinery/porta_turret/syndicate/setup()
+ return
+
+/obj/machinery/porta_turret/syndicate/assess_perp(mob/living/carbon/human/perp)
+ return 10 //Syndicate turrets shoot everything not in their faction
+
+/obj/machinery/porta_turret/syndicate/pod
+ health = 40
+ projectile = /obj/item/projectile/bullet/weakbullet3
+ eprojectile = /obj/item/projectile/bullet/weakbullet3
+
+/obj/machinery/porta_turret/syndicate/interior
+ name = "machine gun turret (.45)"
+ desc = "Syndicate interior defense turret chambered for .45 rounds. Designed to down intruders without damaging the hull."
+ projectile = /obj/item/projectile/bullet/midbullet
+ eprojectile = /obj/item/projectile/bullet/midbullet
+
+/obj/machinery/porta_turret/syndicate/exterior
+ name = "machine gun turret (7.62)"
+ desc = "Syndicate exterior defense turret chambered for 7.62 rounds. Designed to down intruders with heavy calliber bullets."
+ projectile = /obj/item/projectile/bullet
+ eprojectile = /obj/item/projectile/bullet/midbullet
+
+/obj/machinery/porta_turret/syndicate/grenade
+ name = "mounted grenade launcher (40mm)"
+ desc = "Syndicate 40mm grenade launcher defense turret. If you've had this much time to look at it, you're probably already dead."
+ projectile = /obj/item/projectile/bullet/a40mm
+ eprojectile = /obj/item/projectile/bullet/midbullet
+
+/obj/machinery/porta_turret/syndicate/assault_pod
+ name = "machine gun turret (4.6x30mm)"
+ desc = "Syndicate exterior defense turret chambered for 4.6x30mm rounds. Designed to be fitted to assault pods, it uses low calliber bullets to save space."
+ health = 100
+ projectile = /obj/item/projectile/bullet/weakbullet3
+ eprojectile = /obj/item/projectile/bullet/midbullet
+
diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm
new file mode 100644
index 00000000000..809d0a9b09a
--- /dev/null
+++ b/code/game/machinery/quantum_pad.dm
@@ -0,0 +1,148 @@
+/obj/machinery/quantumpad
+ name = "quantum pad"
+ desc = "A bluespace quantum-linked telepad used for teleporting objects to other quantum pads."
+ icon = 'icons/obj/telescience.dmi'
+ icon_state = "qpad-idle"
+ anchored = 1
+ use_power = 1
+ idle_power_usage = 200
+ active_power_usage = 5000
+ var/teleport_cooldown = 400 //30 seconds base due to base parts
+ var/teleport_speed = 50
+ var/last_teleport //to handle the cooldown
+ var/teleporting = 0 //if it's in the process of teleporting
+ var/power_efficiency = 1
+ var/obj/machinery/quantumpad/linked_pad = null
+
+/obj/machinery/quantumpad/New()
+ ..()
+ component_parts = list()
+ component_parts += new /obj/item/weapon/circuitboard/quantumpad(null)
+ component_parts += new /obj/item/weapon/ore/bluespace_crystal/artificial(null)
+ component_parts += new /obj/item/weapon/stock_parts/capacitor(null)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
+ component_parts += new /obj/item/stack/cable_coil(null, 1)
+ RefreshParts()
+
+/obj/machinery/quantumpad/Destroy()
+ linked_pad = null
+ return ..()
+
+/obj/machinery/quantumpad/RefreshParts()
+ var/E = 0
+ for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts)
+ E += C.rating
+ power_efficiency = E
+ E = 0
+ for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
+ E += M.rating
+ teleport_speed = initial(teleport_speed)
+ teleport_speed -= (E*10)
+ teleport_cooldown = initial(teleport_cooldown)
+ teleport_cooldown -= (E * 100)
+
+/obj/machinery/quantumpad/attackby(obj/item/I, mob/user, params)
+ if(default_deconstruction_screwdriver(user, "pad-idle-o", "qpad-idle", I))
+ return
+
+ if(panel_open)
+ if(ismultitool(I))
+ var/obj/item/device/multitool/M = I
+ M.buffer = src
+ to_chat(user, "You save the data in the [I.name]'s buffer.")
+ return 1
+ else if(ismultitool(I))
+ var/obj/item/device/multitool/M = I
+ if(istype(M.buffer, /obj/machinery/quantumpad))
+ linked_pad = M.buffer
+ to_chat(user, "You link the [src] to the one in the [I.name]'s buffer.")
+ return 1
+
+ if(exchange_parts(user, I))
+ return
+
+ if(default_deconstruction_crowbar(I))
+ return
+
+ return ..()
+
+/obj/machinery/quantumpad/attack_hand(mob/user)
+ if(panel_open)
+ to_chat(user, "The panel must be closed before operating this machine!")
+ return
+
+ if(!linked_pad || qdeleted(linked_pad))
+ to_chat(user, "There is no linked pad!")
+ return
+
+ if(world.time < last_teleport + teleport_cooldown)
+ to_chat(user, "[src] is recharging power. Please wait [round((last_teleport + teleport_cooldown - world.time) / 10)] seconds.")
+ return
+
+ if(teleporting)
+ to_chat(user, "[src] is charging up. Please wait.")
+ return
+
+ if(linked_pad.teleporting)
+ to_chat(user, "Linked pad is busy. Please wait.")
+ return
+
+ if(linked_pad.stat & NOPOWER)
+ to_chat(user, "Linked pad is not responding to ping.")
+ return
+ add_fingerprint(user)
+ doteleport(user)
+
+/obj/machinery/quantumpad/proc/sparks()
+ var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ s.set_up(5, 1, get_turf(src))
+ s.start()
+
+/obj/machinery/quantumpad/attack_ghost(mob/dead/observer/ghost)
+ if(linked_pad)
+ ghost.forceMove(get_turf(linked_pad))
+
+/obj/machinery/quantumpad/proc/doteleport(mob/user)
+ if(linked_pad)
+ playsound(get_turf(src), 'sound/weapons/flash.ogg', 25, 1)
+ teleporting = 1
+
+ spawn(teleport_speed)
+ if(!src || qdeleted(src))
+ teleporting = 0
+ return
+ if(stat & NOPOWER)
+ to_chat(user, "[src] is unpowered!")
+ teleporting = 0
+ return
+ if(!linked_pad || qdeleted(linked_pad) || linked_pad.stat & NOPOWER)
+ to_chat(user, "Linked pad is not responding to ping. Teleport aborted.")
+ teleporting = 0
+ return
+
+ teleporting = 0
+ last_teleport = world.time
+
+ // use a lot of power
+ use_power(10000 / power_efficiency)
+ sparks()
+ linked_pad.sparks()
+
+ flick("qpad-beam", src)
+ playsound(get_turf(src), 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5)
+ flick("qpad-beam", linked_pad)
+ playsound(get_turf(linked_pad), 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5)
+ for(var/atom/movable/ROI in get_turf(src))
+ // if is anchored, don't let through
+ if(ROI.anchored)
+ if(isliving(ROI))
+ var/mob/living/L = ROI
+ if(L.buckled)
+ // TP people on office chairs
+ if(L.buckled.anchored)
+ continue
+ else
+ continue
+ else if(!isobserver(ROI))
+ continue
+ do_teleport(ROI, get_turf(linked_pad))
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 936b18f35c5..476162a27a1 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -74,7 +74,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
..()
announcement.title = "[department] announcement"
- announcement.newscast = 1
+ announcement.newscast = 0
name = "[department] Requests Console"
allConsoles += src
diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm
deleted file mode 100644
index dbff4722cad..00000000000
--- a/code/game/machinery/seed_extractor.dm
+++ /dev/null
@@ -1,65 +0,0 @@
-/obj/machinery/seed_extractor
- name = "seed extractor"
- desc = "Extracts and bags seeds from produce."
- icon = 'icons/obj/hydroponics_machines.dmi'
- icon_state = "sextractor"
- density = 1
- anchored = 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() //If you want to make the machine upgradable, this is where you would change any vars basd on its stock parts.
- return
-
-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_unfasten_wrench(user, O))
- return
-
- default_deconstruction_crowbar(O)
-
- // Fruits and vegetables.
- if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown) || istype(O, /obj/item/weapon/grown))
-
- user.drop_item(O)
-
- var/datum/seed/new_seed_type
- if(istype(O, /obj/item/weapon/grown))
- var/obj/item/weapon/grown/F = O
- new_seed_type = plant_controller.seeds[F.plantname]
- else
- var/obj/item/weapon/reagent_containers/food/snacks/grown/F = O
- new_seed_type = plant_controller.seeds[F.plantname]
-
- if(new_seed_type)
- to_chat(user, "You extract some seeds from [O].")
- var/produce = rand(1,4)
- for(var/i = 0;i<=produce;i++)
- var/obj/item/seeds/seeds = new(get_turf(src))
- seeds.seed_type = new_seed_type.name
- seeds.update_seed()
- else
- to_chat(user, "[O] doesn't seem to have any usable seeds inside it.")
-
- qdel(O)
-
- //Grass.
- else if(istype(O, /obj/item/stack/tile/grass))
- var/obj/item/stack/tile/grass/S = O
- to_chat(user, "You extract some seeds from the [S.name].")
- S.use(1)
- new /obj/item/seeds/grassseed(loc)
-
- return
\ No newline at end of file
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index 12404d0574e..614f4d8f53f 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -203,6 +203,10 @@
var/emotion = "Neutral"
+/obj/machinery/ai_status_display/attack_ai(mob/living/silicon/ai/user)
+ if(isAI(user))
+ user.ai_statuschange()
+
/obj/machinery/ai_status_display/process()
if(stat & NOPOWER)
overlays.Cut()
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index bf4300351fa..f9355a98d37 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -257,6 +257,7 @@
var/obj/machinery/syndicatebomb/B = src.loc
for(var/i = 0; i < amt_summon; i++)
var/atom/movable/X = new summon_path
+ X.admin_spawned = TRUE
X.loc = get_turf(src)
if(prob(50))
for(var/j = 1, j <= rand(1, 3), j++)
diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm
index 21da8c4159c..ad5aeb5fc61 100644
--- a/code/game/machinery/turret_control.dm
+++ b/code/game/machinery/turret_control.dm
@@ -25,6 +25,9 @@
var/check_anomalies = 1 //checks if it can shoot at unidentified lifeforms (ie xenos)
var/check_synth = 0 //if active, will shoot at anything not an AI or cyborg
var/ailock = 0 //Silicons cannot use this
+
+ var/syndicate = 0
+ var/faction = "" // Turret controls can only access turrets that are in the same faction
req_access = list(access_ai_upload)
@@ -36,6 +39,23 @@
enabled = 1
lethal = 1
icon_state = "control_kill"
+
+/obj/machinery/turretid/syndicate
+ enabled = 1
+ lethal = 1
+ icon_state = "control_kill"
+
+ lethal = 1
+ check_arrest = 0
+ check_records = 0
+ check_weapons = 0
+ check_access = 0
+ check_anomalies = 1
+ check_synth = 1
+ ailock = 1
+
+ syndicate = 1
+ faction = "syndicate"
/obj/machinery/turretid/Destroy()
if(control_area)
@@ -50,7 +70,7 @@
control_area = get_area(src)
else if(istext(control_area))
for(var/area/A in world)
- if(A.name && A.name==control_area)
+ if(A.name && A.name == control_area)
control_area = A
break
@@ -130,10 +150,10 @@
data["access"] = !isLocked(user)
data["locked"] = locked
data["enabled"] = enabled
- data["is_lethal"] = 1
+ data["lethal_control"] = !syndicate ? 1 : 0
data["lethal"] = lethal
- if(data["access"])
+ if(data["access"] && !syndicate)
var/settings[0]
settings[++settings.len] = list("category" = "Neutralize All Non-Synthetics", "setting" = "check_synth", "value" = check_synth)
settings[++settings.len] = list("category" = "Check Weapon Authorization", "setting" = "check_weapons", "value" = check_weapons)
@@ -156,6 +176,8 @@
var/value = text2num(href_list["value"])
if(href_list["command"] == "enable")
enabled = value
+ else if(syndicate)
+ return 1
else if(href_list["command"] == "lethal")
lethal = value
else if(href_list["command"] == "check_synth")
@@ -188,7 +210,8 @@
if(istype(control_area))
for(var/obj/machinery/porta_turret/aTurret in control_area)
- aTurret.setState(TC)
+ if(faction == aTurret.faction)
+ aTurret.setState(TC)
update_icon()
diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm
deleted file mode 100644
index b8a8eddb79d..00000000000
--- a/code/game/machinery/turrets.dm
+++ /dev/null
@@ -1,580 +0,0 @@
-/area/turret_protected
- name = "Turret Protected Area"
- var/list/turretTargets = list()
-
-/area/turret_protected/proc/subjectDied(target)
- if( isliving(target) )
- if( !issilicon(target) )
- var/mob/living/L = target
- if( L.stat )
- if( L in turretTargets )
- src.Exited(L)
-
-
-/area/turret_protected/Entered(O)
- ..()
- if( iscarbon(O) )
- turretTargets |= O
- else if( istype(O, /obj/mecha) )
- var/obj/mecha/Mech = O
- if( Mech.occupant )
- turretTargets |= Mech
- else if( istype(O, /obj/spacepod) )
- var/obj/spacepod/Pod = O
- if( Pod.pilot )
- turretTargets |= Pod
- else if(istype(O,/mob/living/simple_animal))
- turretTargets |= O
- return 1
-
-/area/turret_protected/Exited(O)
- if( ismob(O) && !issilicon(O) )
- turretTargets -= O
- else if( istype(O, /obj/mecha) )
- turretTargets -= O
- else if( istype(O, /obj/spacepod) )
- turretTargets -= O
- ..()
- return 1
-
-
-/obj/machinery/turret
- name = "turret"
- icon = 'icons/obj/turrets.dmi'
- icon_state = "grey_target_prism"
- var/raised = 0
- var/enabled = 1
- anchored = 1
- layer = 3
- invisibility = INVISIBILITY_LEVEL_TWO
- density = 1
- var/lasers = 0
- var/lasertype = 1
- // 1 = lasers
- // 2 = cannons
- // 3 = pulse
- // 4 = change (HONK)
- // 5 = bluetag
- // 6 = redtag
- var/health = 80
- var/obj/machinery/turretcover/cover = null
- var/popping = 0
- var/wasvalid = 0
- var/lastfired = 0
- var/shot_delay = 30 //3 seconds between shots
- var/datum/effect/system/spark_spread/spark_system
- use_power = 1
- idle_power_usage = 50
- active_power_usage = 300
-// var/list/targets
- var/atom/movable/cur_target
- var/targeting_active = 0
- var/area/turret_protected/protected_area
-
-
-/obj/machinery/turret/New()
- spark_system = new /datum/effect/system/spark_spread
- spark_system.set_up(5, 0, src)
- spark_system.attach(src)
-// targets = new
- ..()
- return
-
-/obj/machinery/turretcover
- name = "pop-up turret cover"
- icon = 'icons/obj/turrets.dmi'
- icon_state = "turretCover"
- anchored = 1
- layer = 3.5
- density = 0
- var/obj/machinery/turret/host = null
-
-/obj/machinery/turret/proc/isPopping()
- return (popping!=0)
-
-/obj/machinery/turret/power_change()
- if(stat & BROKEN)
- icon_state = "grey_target_prism"
- else
- if( powered() )
- if(src.enabled)
- if(src.lasers)
- icon_state = "orange_target_prism"
- else
- icon_state = "target_prism"
- else
- icon_state = "grey_target_prism"
- stat &= ~NOPOWER
- else
- spawn(rand(0, 15))
- src.icon_state = "grey_target_prism"
- stat |= NOPOWER
-
-/obj/machinery/turret/proc/setState(var/enabled, var/lethal)
- src.enabled = enabled
- src.lasers = lethal
- src.power_change()
-
-
-/obj/machinery/turret/proc/get_protected_area()
- var/area/turret_protected/TP = get_area(src)
- if(istype(TP))
- return TP
- return
-
-/obj/machinery/turret/proc/check_target(var/atom/movable/T as mob|obj)
- if( T && T in protected_area.turretTargets )
- var/area/area_T = get_area(T)
- if( !area_T || (area_T.type != protected_area.type) )
- protected_area.Exited(T)
- return 0 //If the guy is somehow not in the turret's area (teleportation), get them out the damn list. --NEO
- if( iscarbon(T) )
- var/mob/living/carbon/MC = T
- if( !MC.stat )
- if( !MC.lying || lasers )
- return 1
- else if( istype(T, /obj/mecha) )
- var/obj/mecha/ME = T
- if( ME.occupant )
- return 1
- else if( istype(T, /obj/spacepod) )
- var/obj/spacepod/SP = T
- if( SP.pilot )
- return 1
- else if(istype(T,/mob/living/simple_animal))
- var/mob/living/simple_animal/A = T
- if( !A.stat )
- if(lasers)
- return 1
- return 0
-
-/obj/machinery/turret/proc/get_new_target()
- var/list/new_targets = new
- var/new_target
- for(var/mob/living/carbon/M in protected_area.turretTargets)
- if(!M.stat)
- if(!M.lying || lasers)
- new_targets += M
- for(var/obj/mecha/M in protected_area.turretTargets)
- if(M.occupant)
- new_targets += M
- for(var/obj/spacepod/M in protected_area.turretTargets)
- if(M.pilot)
- new_targets += M.pilot
- for(var/mob/living/simple_animal/M in protected_area.turretTargets)
- if(!M.stat)
- new_targets += M
- if(new_targets.len)
- new_target = pick(new_targets)
- return new_target
-
-
-/obj/machinery/turret/process()
- if(stat & (NOPOWER|BROKEN))
- return
- if(src.cover==null)
- src.cover = new /obj/machinery/turretcover(src.loc)
- src.cover.host = src
- protected_area = get_protected_area()
- if(!enabled || !protected_area || protected_area.turretTargets.len<=0)
- if(!isDown() && !isPopping())
- popDown()
- return
- if(!check_target(cur_target)) //if current target fails target check
- cur_target = get_new_target() //get new target
-
- if(cur_target) //if it's found, proceed
-// to_chat(world, "[cur_target]")
- if(!isPopping())
- if(isDown())
- popUp()
- use_power = 2
- else
- spawn()
- if(!targeting_active)
- targeting_active = 1
- target()
- targeting_active = 0
-
- if(prob(15))
- if(prob(50))
- playsound(get_turf(src), 'sound/effects/turret/move1.wav', 60, 1)
- else
- playsound(get_turf(src), 'sound/effects/turret/move2.wav', 60, 1)
-
- else if(!isPopping())//else, pop down
- if(!isDown())
- popDown()
- use_power = 1
- return
-
-
-/obj/machinery/turret/proc/target()
- while(src && enabled && !stat && check_target(cur_target))
- src.dir = get_dir(src, cur_target)
- shootAt(cur_target)
- sleep(shot_delay)
- return
-
-/obj/machinery/turret/proc/shootAt(var/atom/movable/target)
- var/turf/T = get_turf(src)
- var/turf/U = get_turf(target)
- if(!T || !U)
- return
- var/obj/item/projectile/A
- if(src.lasers)
- switch(lasertype)
- if(1)
- A = new /obj/item/projectile/beam(loc)
- if(2)
- A = new /obj/item/projectile/beam/laser/heavylaser(loc)
- if(3)
- A = new /obj/item/projectile/beam/pulse(loc)
- if(4)
- A = new /obj/item/projectile/magic/change(loc)
- if(5)
- A = new /obj/item/projectile/beam/lasertag/bluetag(loc)
- if(6)
- A = new /obj/item/projectile/beam/lasertag/redtag(loc)
- use_power(500)
- else
- A = new /obj/item/projectile/energy/electrode( loc )
- use_power(200)
- if(src.lasers)
- playsound(get_turf(src), 'sound/weapons/Laser.ogg', 60, 1)
- else
- playsound(get_turf(src), 'sound/weapons/Taser.ogg', 60, 1)
- A.original = target
- A.current = T
- A.yo = U.y - T.y
- A.xo = U.x - T.x
- A.fire()
- return A
-
-
-/obj/machinery/turret/proc/isDown()
- return (invisibility!=0)
-
-/obj/machinery/turret/proc/popUp()
- if((!isPopping()) || src.popping==-1)
- invisibility = 0
- popping = 1
- playsound(get_turf(src), 'sound/effects/turret/open.wav', 60, 1)
- if(src.cover!=null)
- flick("popup", src.cover)
- src.cover.icon_state = "openTurretCover"
- spawn(10)
- if(popping==1) popping = 0
-
-/obj/machinery/turret/proc/popDown()
- if((!isPopping()) || src.popping==1)
- popping = -1
- playsound(get_turf(src), 'sound/effects/turret/open.wav', 60, 1)
- if(src.cover!=null)
- flick("popdown", src.cover)
- src.cover.icon_state = "turretCover"
- spawn(10)
- if(popping==-1)
- invisibility = INVISIBILITY_LEVEL_TWO
- popping = 0
-
-/obj/machinery/turret/bullet_act(var/obj/item/projectile/Proj)
- if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
- src.health -= Proj.damage
- ..()
- if(prob(45) && Proj.damage > 0) src.spark_system.start()
- qdel(Proj)
- if(src.health <= 0)
- src.die()
- return
-
-/obj/machinery/turret/attackby(obj/item/weapon/W, mob/user)//I can't believe no one added this before/N
- ..()
- user.changeNext_move(CLICK_CD_MELEE)
- playsound(src.loc, 'sound/weapons/smash.ogg', 60, 1)
- src.spark_system.start()
- src.health -= W.force * 0.5
- if(src.health <= 0)
- src.die()
- return
-
-/obj/machinery/turret/emp_act(severity)
- switch(severity)
- if(1)
- enabled = 0
- lasers = 0
- power_change()
- ..()
-
-/obj/machinery/turret/ex_act(severity)
- if(severity < 3)
- src.die()
-
-/obj/machinery/turret/proc/die()
- src.health = 0
- src.density = 0
- src.stat |= BROKEN
- src.icon_state = "destroyed_target_prism"
- if(cover!=null)
- qdel(cover)
- sleep(3)
- flick("explosion", src)
- spawn(13)
- qdel(src)
-
-
-/obj/machinery/turret/attack_animal(mob/living/simple_animal/M as mob)
- M.changeNext_move(CLICK_CD_MELEE)
- M.do_attack_animation(src)
- if(M.melee_damage_upper == 0) return
- if(!(stat & BROKEN))
- visible_message("[M] [M.attacktext] [src]!")
- add_logs(src, M, "attacked", admin=0, print_attack_log = 0)
- //src.create_attack_log("was attacked by [M.name] ([M.ckey])")
- src.health -= M.melee_damage_upper
- if(src.health <= 0)
- src.die()
- else
- to_chat(M, "That object is useless to you.")
- return
-
-
-
-
-/obj/machinery/turret/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
- M.changeNext_move(CLICK_CD_MELEE)
- M.do_attack_animation(src)
- if(!(stat & BROKEN))
- playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1)
- visible_message("[M] has slashed at [src]!")
- src.health -= 15
- if(src.health <= 0)
- src.die()
- else
- to_chat(M, "\green That object is useless to you.")
- return
-
-
-
-/obj/machinery/turretid/Topic(href, href_list, var/nowindow = 0)
- if(..(href, href_list))
- return 1
- if(src.locked)
- if(!istype(usr, /mob/living/silicon))
- to_chat(usr, "Control panel is locked!")
- return
- if(href_list["toggleOn"])
- src.enabled = !src.enabled
- src.updateTurrets()
- else if(href_list["toggleLethal"])
- src.lethal = !src.lethal
- src.updateTurrets()
- if(!nowindow)
- src.attack_hand(usr)
-
-/obj/machinery/turretid/proc/update_icons()
- if(src.enabled)
- if(src.lethal)
- icon_state = "control_kill"
- else
- icon_state = "control_stun"
- else
- icon_state = "control_standby"
- //CODE FIXED BUT REMOVED
-// if(control_area) //USE: updates other controls in the area
-// for(var/obj/machinery/turretid/Turret_Control in world) //I'm not sure if this is what it was
-// if( Turret_Control.control_area != src.control_area ) continue //supposed to do. Or whether the person
-// Turret_Control.icon_state = icon_state //who coded it originally was just tired
-// Turret_Control.enabled = enabled //or something. I don't see any situation
-// Turret_Control.lethal = lethal //in which this would be used on the current map.
- //If he wants it back he can uncomment it
-
-
-/obj/machinery/gun_turret //related to turrets but work way differentely because of being mounted on a moving ship.
- name = "machine gun turret"
- desc = "Syndicate heavy defense turret. It really packs a bunch."
- density = 1
- anchored = 1
- var/state = 0 //Like stat on mobs, 0 is alive, 1 is damaged, 2 is dead
- var/faction = "syndicate"
- var/atom/cur_target = null
- var/scan_range = 9 //You will never see them coming
- var/health = 200 //Because it lacks a cover, and is mostly to keep people from touching the syndie shuttle.
- var/bullet_type = /obj/item/projectile/bullet
- var/firing_sound = 'sound/weapons/Gunshot3.ogg'
- var/base_icon = "syndieturret"
- icon = 'icons/obj/turrets.dmi'
- icon_state = "syndieturret0"
-
-/obj/machinery/gun_turret/New()
- ..()
- take_damage(0) //check your health
-
-/obj/machinery/gun_turret/ex_act(severity)
- switch(severity)
- if(1)
- die()
- if(2)
- take_damage(100)
- if(3)
- take_damage(50)
- return
-
-/obj/machinery/gun_turret/emp_act() //Can't emp an mechanical turret.
- return
-
-/obj/machinery/gun_turret/update_icon()
- if(state > 2 || state < 0) //someone fucked up the vars so fix them
- take_damage(0)
- icon_state = "[base_icon]" + "[state]"
- return
-
-
-/obj/machinery/gun_turret/proc/take_damage(damage)
- health -= damage
- var/orig_health = initial(health)
- var/health_percent = (health/orig_health) * 100
-
- if(health_percent > 50)
- state = 0
- else
- state = 1
- if(health_percent <= 0)
- if(state != 2)
- die()
- return
- state = 2
-
- update_icon()
-
-
-
-
-/obj/machinery/gun_turret/bullet_act(var/obj/item/projectile/Proj)
- if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
- take_damage(Proj.damage)
- return
-
-/obj/machinery/gun_turret/proc/die()
- state = 2
- update_icon()
-
-/obj/machinery/gun_turret/attack_hand(mob/user)
- return
-
-/obj/machinery/gun_turret/attack_ai(mob/user)
- return attack_hand(user)
-
-
-/obj/machinery/gun_turret/attack_alien(mob/living/user as mob)
- user.changeNext_move(CLICK_CD_MELEE)
- user.do_attack_animation(src)
- playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1)
- user.visible_message("[user] slashes at [src]", "You slash at [src]")
- take_damage(15)
- return
-
-/obj/machinery/gun_turret/proc/validate_target(atom/target)
- if(get_dist(target, src)>scan_range)
- return 0
- if(istype(target, /mob))
- var/mob/M = target
- if(!M.stat)
- return 1
- else if(istype(target, /obj/mecha))
- var/obj/mecha/M = target
- if(M.occupant)
- return 1
- else if(istype(target, /obj/spacepod))
- var/obj/spacepod/S = target
- if(S.pilot)
- return 1
- return 0
-
-
-/obj/machinery/gun_turret/process()
- if(state == 2)
- return
- if(cur_target && !validate_target(cur_target))
- cur_target = null
- if(!cur_target)
- cur_target = get_target()
- if(cur_target)
- fire(cur_target)
- return
-
-
-/obj/machinery/gun_turret/proc/get_target()
- var/list/pos_targets = list()
- var/target = null
- for(var/mob/living/M in view(scan_range,src))
- if(M.stat)
- continue
- if(faction in M.faction)
- continue
- if(ispAI(M))
- continue
- pos_targets += M
- for(var/obj/mecha/M in oview(scan_range, src))
- if(M.occupant)
- if(faction in M.occupant.faction)
- continue
- if(!M.occupant)
- continue //Don't shoot at empty mechs.
- pos_targets += M
- for(var/obj/spacepod/M in oview(scan_range, src))
- if(M.pilot)
- var/mob/P = M.pilot
- if(faction in P.faction)
- continue
- if(!M.pilot)
- continue //Don't shoot at empty pods.
- pos_targets += M
- if(pos_targets.len)
- target = pick(pos_targets)
- return target
-
-
-/obj/machinery/gun_turret/proc/fire(atom/target)
- if(!target)
- cur_target = null
- return
- src.dir = get_dir(src,target)
- var/turf/targloc = get_turf(target)
- if(!src)
- return
- var/turf/curloc = get_turf(src)
- if(!targloc || !curloc)
- return
- if(targloc == curloc)
- return
- playsound(get_turf(src), firing_sound, 60, 1)
- var/obj/item/projectile/A = new bullet_type(curloc)
- A.original = target
- A.current = curloc
- A.yo = targloc.y - curloc.y
- A.xo = targloc.x - curloc.x
- A.fire()
- return
-
-
-/obj/machinery/gun_turret/interior
- name = "machine gun turret (.45)"
- desc = "Syndicate interior defense turret chambered for .45 rounds. Designed to down intruders without damaging the hull."
- bullet_type = /obj/item/projectile/bullet/midbullet
-
-/obj/machinery/gun_turret/exterior
- name = "machine gun turret (7.62)"
- desc = "Syndicate exterior defense turret chambered for 7.62 rounds. Designed to down intruders with heavy calliber bullets."
- bullet_type = /obj/item/projectile/bullet
-
-/obj/machinery/gun_turret/grenade
- name = "mounted grenade launcher (40mm)"
- desc = "Syndicate 40mm grenade launcher defense turret. If you've had this much time to look at it, you're probably already dead."
- bullet_type = /obj/item/projectile/bullet/a40mm
-
-/obj/machinery/gun_turret/assault_pod
- name = "machine gun turret (4.6x30mm)"
- desc = "Syndicate exterior defense turret chambered for 4.6x30mm rounds. Designed to be fitted to assault pods, it uses low calliber bullets to save space."
- health = 100
- bullet_type = /obj/item/projectile/bullet/weakbullet3
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 55b7a18c936..1ba521f1280 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -800,6 +800,17 @@
/obj/item/weapon/reagent_containers/food/snacks/chinese/rice = 6)
prices = list(/obj/item/weapon/reagent_containers/food/snacks/chinese/chowmein = 50, /obj/item/weapon/reagent_containers/food/snacks/chinese/tao = 50, /obj/item/weapon/reagent_containers/food/snacks/chinese/newdles = 50,
/obj/item/weapon/reagent_containers/food/snacks/chinese/rice = 50)
+ refill_canister = /obj/item/weapon/vending_refill/chinese
+
+/obj/machinery/vending/chinese/New()
+ ..()
+ component_parts = list()
+ var/obj/item/weapon/circuitboard/vendor/V = new(null)
+ V.set_type(type)
+ component_parts += V
+ component_parts += new /obj/item/weapon/vending_refill/chinese(0)
+ component_parts += new /obj/item/weapon/vending_refill/chinese(0)
+ component_parts += new /obj/item/weapon/vending_refill/chinese(0)
/obj/machinery/vending/cola
name = "\improper Robust Softdrinks"
@@ -865,10 +876,10 @@
product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs."
vend_delay = 34
icon_state = "cigs"
- products = list(/obj/item/weapon/storage/fancy/cigarettes = 5,/obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 3,/obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 2,/obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 3,/obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 1,/obj/item/weapon/storage/fancy/cigarettes/cigpack_random = 2, /obj/item/weapon/reagent_containers/food/pill/patch/nicotine = 10, /obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 4,/obj/item/weapon/rollingpaperpack = 5)
+ products = list(/obj/item/weapon/storage/fancy/cigarettes = 5,/obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 3,/obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 2,/obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 3,/obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 1,/obj/item/weapon/storage/fancy/cigarettes/cigpack_random = 2, /obj/item/weapon/reagent_containers/food/pill/patch/nicotine = 10, /obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 4,/obj/item/weapon/storage/fancy/rollingpapers = 5)
contraband = list(/obj/item/weapon/lighter/zippo = 4)
premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2,/obj/item/weapon/storage/fancy/cigarettes/cigpack_robustgold = 1)
- prices = list(/obj/item/weapon/storage/fancy/cigarettes = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_random = 150, /obj/item/weapon/reagent_containers/food/pill/patch/nicotine = 15, /obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 60, /obj/item/weapon/rollingpaperpack = 20)
+ prices = list(/obj/item/weapon/storage/fancy/cigarettes = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_random = 150, /obj/item/weapon/reagent_containers/food/pill/patch/nicotine = 15, /obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 60, /obj/item/weapon/storage/fancy/rollingpapers = 20)
refill_canister = /obj/item/weapon/vending_refill/cigarette
/obj/machinery/vending/cigarette/New()
@@ -955,8 +966,8 @@
product_ads = "We like plants!;Don't you want some?;The greenest thumbs ever.;We like big plants.;Soft soil..."
icon_state = "nutri"
icon_deny = "nutri-deny"
- products = list(/obj/item/weapon/reagent_containers/glass/bottle/fertilizer/ez = 35,/obj/item/weapon/reagent_containers/glass/bottle/fertilizer/l4z = 25,/obj/item/weapon/reagent_containers/glass/bottle/fertilizer/rh = 15,/obj/item/weapon/plantspray/pests = 20,
- /obj/item/weapon/reagent_containers/syringe = 5,/obj/item/weapon/storage/bag/plants = 5)
+ products = list(/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez = 30,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/l4z = 20,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh = 10,/obj/item/weapon/reagent_containers/spray/pestspray = 20,
+ /obj/item/weapon/reagent_containers/syringe = 5,/obj/item/weapon/storage/bag/plants = 5,/obj/item/weapon/cultivator = 3,/obj/item/weapon/shovel/spade = 3,/obj/item/device/plant_analyzer = 4)
contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5)
///obj/item/beezeez = 45,
@@ -967,16 +978,16 @@
product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!"
product_ads = "We like plants!;Grow some crops!;Grow, baby, growww!;Aw h'yeah son!"
icon_state = "seeds"
- products = list(/obj/item/seeds/aloeseed = 3,/obj/item/seeds/ambrosiavulgarisseed = 3,/obj/item/seeds/appleseed = 3,/obj/item/seeds/bananaseed = 3,/obj/item/seeds/berryseed = 3,
- /obj/item/seeds/cabbageseed = 3,/obj/item/seeds/carrotseed = 3,/obj/item/seeds/cherryseed = 3,/obj/item/seeds/chantermycelium = 3,
- /obj/item/seeds/chiliseed = 3,/obj/item/seeds/cocoapodseed = 3,/obj/item/seeds/coffeeaseed = 3,/obj/item/seeds/comfreyseed =3,/obj/item/seeds/cornseed = 3,
- /obj/item/seeds/eggplantseed = 3,/obj/item/seeds/grapeseed = 3,/obj/item/seeds/grassseed = 3,/obj/item/seeds/lemonseed = 3,
- /obj/item/seeds/limeseed = 3,/obj/item/seeds/orangeseed = 3,/obj/item/seeds/peanutseed = 3,/obj/item/seeds/potatoseed = 3,/obj/item/seeds/poppyseed = 3,
- /obj/item/seeds/pumpkinseed = 3,/obj/item/seeds/replicapod = 3,/obj/item/seeds/riceseed = 3,/obj/item/seeds/soyaseed = 3,/obj/item/seeds/sunflowerseed = 3,
- /obj/item/seeds/teaasperaseed = 3,/obj/item/seeds/tobaccoseed = 3,/obj/item/seeds/tomatoseed = 3,
- /obj/item/seeds/towermycelium = 3,/obj/item/seeds/watermelonseed = 3,/obj/item/seeds/wheatseed = 3,/obj/item/seeds/whitebeetseed = 3)
- contraband = list(/obj/item/seeds/amanitamycelium = 2,/obj/item/seeds/glowshroom = 2,/obj/item/seeds/libertymycelium = 2,/obj/item/seeds/nettleseed = 2,
- /obj/item/seeds/plumpmycelium = 2,/obj/item/seeds/random = 2, /obj/item/seeds/reishimycelium = 2, /obj/item/seeds/brownmold = 2)
+ products = list(/obj/item/seeds/aloe =3, /obj/item/seeds/ambrosia = 3,/obj/item/seeds/apple = 3,/obj/item/seeds/banana = 3,/obj/item/seeds/berry = 3,
+ /obj/item/seeds/cabbage = 3,/obj/item/seeds/carrot = 3,/obj/item/seeds/cherry = 3,/obj/item/seeds/chanter = 3,
+ /obj/item/seeds/chili = 3,/obj/item/seeds/cocoapod = 3,/obj/item/seeds/coffee = 3, /obj/item/seeds/comfrey =3, /obj/item/seeds/corn = 3,
+ /obj/item/seeds/nymph =3, /obj/item/seeds/eggplant = 3,/obj/item/seeds/grape = 3,/obj/item/seeds/grass = 3,/obj/item/seeds/lemon = 3,
+ /obj/item/seeds/lime = 3,/obj/item/seeds/orange = 3, /obj/item/seeds/peanuts = 3, /obj/item/seeds/potato = 3,/obj/item/seeds/poppy = 3,
+ /obj/item/seeds/pumpkin = 3,/obj/item/seeds/replicapod = 3,/obj/item/seeds/wheat/rice = 3,/obj/item/seeds/soya = 3,/obj/item/seeds/sunflower = 3,
+ /obj/item/seeds/tea = 3,/obj/item/seeds/tobacco = 3,/obj/item/seeds/tomato = 3,
+ /obj/item/seeds/tower = 3,/obj/item/seeds/watermelon = 3,/obj/item/seeds/wheat = 3,/obj/item/seeds/whitebeet = 3)
+ contraband = list(/obj/item/seeds/amanita = 2,/obj/item/seeds/glowshroom = 2,/obj/item/seeds/liberty = 2,/obj/item/seeds/nettle = 2,
+ /obj/item/seeds/plump = 2,/obj/item/seeds/reishi = 2,/obj/item/seeds/cannabis = 3, /obj/item/seeds/fungus = 3, /obj/item/seeds/random = 2)
premium = list(/obj/item/weapon/reagent_containers/spray/waterflower = 1)
/**
@@ -1117,7 +1128,7 @@
icon_state = "engivend"
icon_deny = "engivend-deny"
req_access_txt = "11" //Engineering Equipment access
- products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/device/multitool = 4,/obj/item/weapon/airlock_electronics = 10,/obj/item/weapon/firealarm_electronics = 10,/obj/item/weapon/apc_electronics = 10,/obj/item/weapon/airalarm_electronics = 10,/obj/item/weapon/stock_parts/cell/high = 10,/obj/item/weapon/camera_assembly = 10)
+ products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/device/multitool = 4,/obj/item/weapon/airlock_electronics = 10,/obj/item/weapon/firelock_electronics = 10,/obj/item/weapon/firealarm_electronics = 10,/obj/item/weapon/apc_electronics = 10,/obj/item/weapon/airalarm_electronics = 10,/obj/item/weapon/stock_parts/cell/high = 10,/obj/item/weapon/camera_assembly = 10)
contraband = list(/obj/item/weapon/stock_parts/cell/potato = 3)
premium = list(/obj/item/weapon/storage/belt/utility = 3)
diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm
index c75ff304922..471a24078fb 100644
--- a/code/game/mecha/combat/gygax.dm
+++ b/code/game/mecha/combat/gygax.dm
@@ -46,17 +46,13 @@
ME.attach(src)
ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang
ME.attach(src)
- ME = new /obj/item/mecha_parts/mecha_equipment/teleporter
+ ME = new /obj/item/mecha_parts/mecha_equipment/teleporter/precise
ME.attach(src)
ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay
ME.attach(src)
-/obj/mecha/combat/gygax/dark/add_cell(var/obj/item/weapon/stock_parts/cell/C=null)
- if(C)
- C.forceMove(src)
- cell = C
- return
- cell = new(src)
+/obj/mecha/combat/gygax/dark/add_cell()
+ cell = new /obj/item/weapon/stock_parts/cell/bluespace(src)
cell.charge = 30000
cell.maxcharge = 30000
diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm
index cecbc1e5b13..97b442a51da 100644
--- a/code/game/mecha/combat/marauder.dm
+++ b/code/game/mecha/combat/marauder.dm
@@ -50,6 +50,11 @@
force = 55
max_equip = 5
+/obj/mecha/combat/marauder/seraph/add_cell()
+ cell = new /obj/item/weapon/stock_parts/cell/bluespace(src)
+ cell.charge = 40000
+ cell.maxcharge = 40000
+
/obj/mecha/combat/marauder/seraph/loaded/New()
..()//Let it equip whatever is needed.
var/obj/item/mecha_parts/mecha_equipment/ME
@@ -61,7 +66,7 @@
ME.attach(src)
ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack(src)
ME.attach(src)
- ME = new /obj/item/mecha_parts/mecha_equipment/teleporter(src)
+ ME = new /obj/item/mecha_parts/mecha_equipment/teleporter/precise(src)
ME.attach(src)
ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src)
ME.attach(src)
diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm
index 184766dc3ed..9e2a754bd4c 100644
--- a/code/game/mecha/equipment/tools/other_tools.dm
+++ b/code/game/mecha/equipment/tools/other_tools.dm
@@ -9,17 +9,25 @@
icon_state = "mecha_teleport"
origin_tech = "bluespace=10"
equip_cooldown = 150
- energy_drain = 1000
+ energy_drain = 8000
range = RANGED
+ var/tele_precision = 4
/obj/item/mecha_parts/mecha_equipment/teleporter/action(atom/target)
if(!action_checks(target) || !is_teleport_allowed(loc.z))
return
var/turf/T = get_turf(target)
if(T)
- do_teleport(chassis, T, 4)
+ chassis.use_power(energy_drain)
+ do_teleport(chassis, T, tele_precision)
return 1
+/obj/item/mecha_parts/mecha_equipment/teleporter/precise
+ name = "upgraded teleporter"
+ desc = "An exosuit module that allows exosuits to teleport to any position in view. This is the high-precision, energy-efficient version."
+ origin_tech = "bluespace=13"
+ energy_drain = 1000
+ tele_precision = 1
////////////////////////////////////////////// WORMHOLE GENERATOR //////////////////////////////////////////
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index f9ad5b48f85..93a86fbe956 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -358,7 +358,7 @@
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar
name = "Banana Mortar"
icon_state = "mecha_bananamrtr"
- projectile = /obj/item/weapon/bananapeel
+ projectile = /obj/item/weapon/grown/bananapeel
fire_sound = 'sound/items/bikehorn.ogg'
projectiles = 15
missile_speed = 1.5
@@ -375,7 +375,7 @@
if(!action_checks(target))
return
set_ready_state(0)
- var/obj/item/weapon/bananapeel/B = new projectile(chassis.loc)
+ var/obj/item/weapon/grown/bananapeel/B = new projectile(chassis.loc)
playsound(chassis, fire_sound, 60, 1)
B.throw_at(target, missile_range, missile_speed, chassis)
projectiles--
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index b5fcb46b39c..4ec4746a198 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -50,6 +50,7 @@
var/obj/machinery/atmospherics/unary/portables_connector/connected_port = null
var/obj/item/device/radio/radio = null
+ var/list/trackers = list()
var/max_temperature = 25000
var/internal_damage_threshold = 50 //health percentage below which internal damage is possible
@@ -74,7 +75,7 @@
var/melee_cooldown = 10
var/melee_can_hit = 1
- hud_possible = list (DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD)
+ hud_possible = list (DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_TRACK_HUD)
/obj/mecha/New()
..()
@@ -93,6 +94,7 @@
processing_objects.Add(src)
removeVerb(/obj/mecha/verb/disconnect_from_port)
+ poi_list |= src
log_message("[src] created.")
mechas_list += src //global mech list
prepare_huds()
@@ -101,6 +103,7 @@
diag_hud_set_mechhealth()
diag_hud_set_mechcell()
diag_hud_set_mechstat()
+ diag_hud_set_mechtracking()
////////////////////////
////// Helpers /////////
@@ -164,7 +167,7 @@
/obj/mecha/proc/drop_item()//Derpfix, but may be useful in future for engineering exosuits.
return
-/obj/mecha/hear_talk(mob/M as mob, text)
+/obj/mecha/hear_talk(mob/M, text)
if(M == occupant && radio.broadcasting)
radio.talk_into(M, text)
@@ -464,7 +467,7 @@
qdel(src)
return
-/obj/mecha/attack_hand(mob/living/user as mob)
+/obj/mecha/attack_hand(mob/living/user)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
log_message("Attack by hand/paw. Attacker - [user].",1)
@@ -480,7 +483,7 @@
return
-/obj/mecha/attack_alien(mob/living/user as mob)
+/obj/mecha/attack_alien(mob/living/user)
log_message("Attack by alien. Attacker - [user].",1)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
@@ -499,7 +502,7 @@
return
-/obj/mecha/attack_animal(mob/living/simple_animal/user as mob)
+/obj/mecha/attack_animal(mob/living/simple_animal/user)
log_message("Attack by simple animal. Attacker - [user].",1)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
@@ -512,7 +515,7 @@
take_damage(damage)
check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
visible_message("[user] [user.attacktext] [src]!")
- user.create_attack_log("attacked [src.name]")
+ user.create_attack_log("attacked [name]")
else
log_append_to_last("Armor saved.")
playsound(loc, 'sound/weapons/slash.ogg', 50, 1, -1)
@@ -616,6 +619,7 @@
qdel(internal_tank)
processing_objects.Remove(src)
+ poi_list.Remove(src)
equipment.Cut()
cell = null
internal_tank = null
@@ -796,7 +800,9 @@
to_chat(user, "\the [W] is stuck to your hand, you cannot put it in \the [src]")
return
W.forceMove(src)
+ trackers += W
user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src].")
+ diag_hud_set_mechtracking()
return
else if(istype(W, /obj/item/weapon/paintkit))
@@ -831,6 +837,8 @@
/obj/mecha/proc/attacked_by(obj/item/I, mob/user)
log_message("Attacked by [I]. Attacker - [user]")
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
var/deflection = deflect_chance
var/dam_coeff = 1
for(var/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/B in equipment)
@@ -862,20 +870,35 @@
//////////// AI piloting ////////////
/////////////////////////////////////
-/obj/mecha/attack_ai(var/mob/living/silicon/ai/user as mob)
+/obj/mecha/attack_ai(mob/living/silicon/ai/user)
if(!isAI(user))
return
//Allows the Malf to scan a mech's status and loadout, helping it to decide if it is a worthy chariot.
if(user.can_dominate_mechs)
examine(user) //Get diagnostic information!
- var/obj/item/mecha_parts/mecha_tracking/B = locate(/obj/item/mecha_parts/mecha_tracking) in src
- if(B) //Beacons give the AI more detailed mech information.
+ for(var/obj/item/mecha_parts/mecha_tracking/B in trackers)
to_chat(user, "Warning: Tracking Beacon detected. Enter at your own risk. Beacon Data:")
- to_chat(user, "[B.get_mecha_info()]")
+ to_chat(user, "[B.get_mecha_info_text()]")
+ break
//Nothing like a big, red link to make the player feel powerful!
to_chat(user, "ASSUME DIRECT CONTROL?
")
+ else
+ examine(user)
+ if(occupant)
+ user << "This exosuit has a pilot and cannot be controlled."
+ return
+ var/can_control_mech = FALSE
+ for(var/obj/item/mecha_parts/mecha_tracking/ai_control/A in trackers)
+ can_control_mech = TRUE
+ to_chat(user, "[bicon(src)] Status of [name]:\n\
+ [A.get_mecha_info_text()]")
+ break
+ if(!can_control_mech)
+ to_chat(user, "You cannot control exosuits without AI control beacons installed.")
+ return
+ to_chat(user, "Take control of exosuit?
")
-/obj/mecha/transfer_ai(var/interaction, mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card)
+/obj/mecha/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card)
if(!..())
return
@@ -903,12 +926,13 @@
to_chat(AI, "You have been downloaded to a mobile storage device. Wireless connection offline.")
to_chat(user, "Transfer successful: [AI.name] ([rand(1000,9999)].exe) removed from [name] and stored within local memory.")
- if(AI_MECH_HACK) //Called by Malf AI mob on the mech.
- new /obj/structure/AIcore/deactivated(AI.loc)
- if(occupant) //Oh, I am sorry, were you using that?
- to_chat(AI, "Pilot detected! Forced ejection initiated!")
- to_chat(occupant, "You have been forcibly ejected!")
- go_out(1) //IT IS MINE, NOW. SUCK IT, RD!
+ if(AI_MECH_HACK) //Called by AIs on the mech
+ AI.linked_core = new /obj/structure/AIcore/deactivated(AI.loc)
+ if(AI.can_dominate_mechs)
+ if(occupant) //Oh, I am sorry, were you using that?
+ to_chat(AI, "Pilot detected! Forced ejection initiated!")
+ to_chat(occupant, "You have been forcibly ejected!")
+ go_out(1) //IT IS MINE, NOW. SUCK IT, RD!
ai_enter_mech(AI, interaction)
if(AI_TRANS_FROM_CARD) //Using an AI card to upload to a mech.
@@ -928,7 +952,7 @@
ai_enter_mech(AI, interaction)
//Hack and From Card interactions share some code, so leave that here for both to use.
-/obj/mecha/proc/ai_enter_mech(var/mob/living/silicon/ai/AI, var/interaction)
+/obj/mecha/proc/ai_enter_mech(mob/living/silicon/ai/AI, interaction)
AI.aiRestorePowerRoutine = 0
AI.loc = src
occupant = AI
@@ -941,7 +965,7 @@
AI.remote_control = src
AI.canmove = 1 //Much easier than adding AI checks! Be sure to set this back to 0 if you decide to allow an AI to leave a mech somehow.
AI.can_shunt = 0 //ONE AI ENTERS. NO AI LEAVES.
- to_chat(AI, "[interaction == AI_MECH_HACK ? "Takeover of [name] complete! You are now permanently loaded onto the onboard computer. Do not attempt to leave the station sector!" \
+ to_chat(AI, "[AI.can_dominate_mechs ? "Takeover of [name] complete! You are now permanently loaded onto the onboard computer. Do not attempt to leave the station sector!" \
: "You have been uploaded to a mech's onboard computer."]")
to_chat(AI, "Use Middle-Mouse to activate mech functions and equipment. Click normally for AI interactions.")
@@ -1168,7 +1192,7 @@
to_chat(user, "You stop inserting the MMI.")
return 0
-/obj/mecha/proc/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob)
+/obj/mecha/proc/mmi_moved_inside(obj/item/device/mmi/mmi_as_oc,mob/user)
if(mmi_as_oc && user in range(1))
if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client)
to_chat(user, "Consciousness matrix not detected.")
@@ -1235,7 +1259,7 @@
if(occupant && occupant == M) // The occupant exited the mech without calling go_out()
go_out(1, newloc)
-/obj/mecha/proc/go_out(var/forced, var/atom/newloc = loc)
+/obj/mecha/proc/go_out(forced, atom/newloc = loc)
if(!occupant)
return
var/atom/movable/mob_container
@@ -1244,15 +1268,29 @@
if(ishuman(occupant))
mob_container = occupant
//RemoveActions(occupant, human_occupant=1)
- else if(istype(occupant, /mob/living/carbon/brain))
+ else if(isbrain(occupant))
var/mob/living/carbon/brain/brain = occupant
//RemoveActions(brain)
mob_container = brain.container
- else if(isAI(occupant) && forced) //This should only happen if there are multiple AIs in a round, and at least one is Malf.
- //RemoveActions(occupant)
- occupant.gib() //If one Malf decides to steal a mech from another AI (even other Malfs!), they are destroyed, as they have nowhere to go when replaced.
- occupant = null
- return
+ else if(isAI(occupant))
+ var/mob/living/silicon/ai/AI = occupant
+ if(forced)//This should only happen if there are multiple AIs in a round, and at least one is Malf.
+ //RemoveActions(occupant)
+ occupant.gib() //If one Malf decides to steal a mech from another AI (even other Malfs!), they are destroyed, as they have nowhere to go when replaced.
+ occupant = null
+ return
+ else
+ if(!AI.linked_core || qdeleted(AI.linked_core))
+ to_chat(AI, "Inactive core destroyed. Unable to return.")
+ AI.linked_core = null
+ return
+ to_chat(AI, "Returning to core...")
+ AI.controlled_mech = null
+ AI.remote_control = null
+ //RemoveActions(occupant, 1)
+ mob_container = AI
+ newloc = get_turf(AI.linked_core)
+ qdel(AI.linked_core)
else
return
var/mob/living/L = occupant
@@ -1435,6 +1473,7 @@
diag_hud_set_mechhealth()
diag_hud_set_mechcell()
diag_hud_set_mechstat()
+ diag_hud_set_mechtracking()
/obj/mecha/speech_bubble(var/bubble_state = "",var/bubble_loc = src, var/list/bubble_recipients = list())
diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm
index 11c940f7971..2bb73e2c636 100644
--- a/code/game/mecha/mecha_control_console.dm
+++ b/code/game/mecha/mecha_control_console.dm
@@ -10,10 +10,10 @@
var/screen = 0
var/stored_data
-/obj/machinery/computer/mecha/attack_ai(var/mob/user as mob)
+/obj/machinery/computer/mecha/attack_ai(mob/user)
return attack_hand(user)
-/obj/machinery/computer/mecha/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/mecha/attack_hand(mob/user)
ui_interact(user)
/obj/machinery/computer/mecha/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
@@ -73,11 +73,12 @@
icon_state = "motion2"
w_class = 2
origin_tech = "programming=2;magnets=2"
+ var/ai_beacon = FALSE //If this beacon allows for AI control. Exists to avoid using istype() on checking.
/obj/item/mecha_parts/mecha_tracking/proc/get_mecha_info()
if(!in_mecha())
- return 0
- var/obj/mecha/M = src.loc
+ return FALSE
+ var/obj/mecha/M = loc
var/list/answer[0]
answer["reference"] = "\ref[src]"
answer["name"] = sanitize(replacetext(M.name,"\"","'")) // Double apostrophes break JSON
@@ -101,6 +102,25 @@
return answer
+/obj/item/mecha_parts/mecha_tracking/proc/get_mecha_info_text()
+ if(!in_mecha())
+ return FALSE
+ var/obj/mecha/M = loc
+ var/cell_charge = M.get_charge()
+ var/area/A = get_area(M)
+ var/answer = {"Name: [M.name]
+ Integrity: [M.health/initial(M.health)*100]%
+ Cell charge: [isnull(cell_charge)?"Not found":"[M.cell.percent()]%"]
+ Airtank: [M.return_pressure()]kPa
+ Pilot: [M.occupant||"None"]
+ Location: [sanitize(A.name)||"Unknown"]
+ Active equipment: [M.selected||"None"]
"}
+ if(istype(M, /obj/mecha/working/ripley))
+ var/obj/mecha/working/ripley/RM = M
+ answer += "Used cargo space: [RM.cargo.len/RM.cargo_capacity*100]%
"
+
+ return answer
+
/obj/item/mecha_parts/mecha_tracking/emp_act()
qdel(src)
return
@@ -110,9 +130,9 @@
return
/obj/item/mecha_parts/mecha_tracking/proc/in_mecha()
- if(istype(src.loc, /obj/mecha))
- return src.loc
- return 0
+ if(istype(loc, /obj/mecha))
+ return loc
+ return FALSE
/obj/item/mecha_parts/mecha_tracking/proc/shock()
var/obj/mecha/M = in_mecha()
@@ -121,19 +141,26 @@
qdel(src)
/obj/item/mecha_parts/mecha_tracking/proc/get_mecha_log()
- if(!src.in_mecha())
+ if(!in_mecha())
return 0
- var/obj/mecha/M = src.loc
+ var/obj/mecha/M = loc
return M.get_log_html()
+/obj/item/mecha_parts/mecha_tracking/ai_control
+ name = "exosuit AI control beacon"
+ desc = "A device used to transmit exosuit data. Also allows active AI units to take control of said exosuit."
+ origin_tech = "programming=3;magnets=2;engineering=2"
+ ai_beacon = TRUE
+
/obj/item/weapon/storage/box/mechabeacons
name = "Exosuit Tracking Beacons"
- New()
- ..()
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
+
+/obj/item/weapon/storage/box/mechabeacons/New()
+ ..()
+ new /obj/item/mecha_parts/mecha_tracking(src)
+ new /obj/item/mecha_parts/mecha_tracking(src)
+ new /obj/item/mecha_parts/mecha_tracking(src)
+ new /obj/item/mecha_parts/mecha_tracking(src)
+ new /obj/item/mecha_parts/mecha_tracking(src)
+ new /obj/item/mecha_parts/mecha_tracking(src)
+ new /obj/item/mecha_parts/mecha_tracking(src)
diff --git a/code/game/mecha/medical/medical.dm b/code/game/mecha/medical/medical.dm
index ce28687a9e6..8aee3ef1f4c 100644
--- a/code/game/mecha/medical/medical.dm
+++ b/code/game/mecha/medical/medical.dm
@@ -4,4 +4,4 @@
/obj/mecha/medical/New()
..()
- new /obj/item/mecha_parts/mecha_tracking(src)
+ trackers += new /obj/item/mecha_parts/mecha_tracking(src)
diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm
index f26e34834fb..bb5e0237c9b 100644
--- a/code/game/mecha/working/ripley.dm
+++ b/code/game/mecha/working/ripley.dm
@@ -110,10 +110,10 @@
//Add ore box to cargo
cargo.Add(new /obj/structure/ore_box(src))
- //Attach hydrolic clamp
+ //Attach hydraulic clamp
var/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/HC = new /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp
HC.attach(src)
- for(var/obj/item/mecha_parts/mecha_tracking/B in contents)//Deletes the beacon so it can't be found easily
+ for(var/obj/item/mecha_parts/mecha_tracking/B in trackers)//Deletes the beacon so it can't be found easily
qdel(B)
var/obj/item/mecha_parts/mecha_equipment/mining_scanner/scanner = new /obj/item/mecha_parts/mecha_equipment/mining_scanner
diff --git a/code/game/mecha/working/working.dm b/code/game/mecha/working/working.dm
index ccbfe2ef21b..e4c001a508a 100644
--- a/code/game/mecha/working/working.dm
+++ b/code/game/mecha/working/working.dm
@@ -3,4 +3,4 @@
/obj/mecha/working/New()
..()
- new /obj/item/mecha_parts/mecha_tracking(src)
+ trackers += new /obj/item/mecha_parts/mecha_tracking(src)
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index ea692339ac3..8ff0d7cfcf4 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -35,11 +35,11 @@
return FALSE
//procs that handle the actual buckling and unbuckling
-/atom/movable/proc/buckle_mob(mob/living/M)
- if(!can_buckle || !istype(M) || (M.loc != loc) || M.buckled || M.buckled_mob || buckled_mob || (buckle_requires_restraints && !M.restrained()) || M == src)
+/atom/movable/proc/buckle_mob(mob/living/M, force = 0)
+ if((!can_buckle && !force)|| !istype(M) || (M.loc != loc) || M.buckled || M.buckled_mob || buckled_mob || (buckle_requires_restraints && !M.restrained()) || M == src)
return 0
- if(isslime(M) || isAI(M))
+ if((isslime(M) || isAI(M)) && !force)
if(M == usr)
to_chat(M, "You are unable to buckle yourself to the [src]!")
else
@@ -54,7 +54,7 @@
M.throw_alert("buckled", /obj/screen/alert/restrained/buckled, new_master = src)
return 1
-/obj/buckle_mob(mob/living/M)
+/obj/buckle_mob(mob/living/M, force = 0)
. = ..()
if(.)
if(burn_state == ON_FIRE) //Sets the mob on fire if you buckle them to a burning atom/movableect
diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm
index 106c451ca09..19cbbd38c5a 100644
--- a/code/game/objects/effects/aliens.dm
+++ b/code/game/objects/effects/aliens.dm
@@ -363,7 +363,8 @@
break
/obj/structure/alien/egg/bullet_act(obj/item/projectile/Proj)
- health -= Proj.damage
+ if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
+ health -= Proj.damage
..()
healthcheck()
diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm
index 090a7437a5b..434fec620b8 100644
--- a/code/game/objects/effects/anomalies.dm
+++ b/code/game/objects/effects/anomalies.dm
@@ -18,6 +18,11 @@
var/new_frequency = sanitize_frequency(rand(PUBLIC_LOW_FREQ, PUBLIC_HIGH_FREQ))
aSignal.set_frequency(new_frequency)
+ poi_list |= src
+
+/obj/effect/anomaly/Destroy()
+ poi_list.Remove(src)
+ return ..()
/obj/effect/anomaly/proc/anomalyEffect()
if(prob(50))
diff --git a/code/game/objects/effects/decals/Cleanable/fuel.dm b/code/game/objects/effects/decals/Cleanable/fuel.dm
index aad9f5ab4bf..3d6a47a00b9 100644
--- a/code/game/objects/effects/decals/Cleanable/fuel.dm
+++ b/code/game/objects/effects/decals/Cleanable/fuel.dm
@@ -1,4 +1,4 @@
-obj/effect/decal/cleanable/liquid_fuel
+/obj/effect/decal/cleanable/liquid_fuel
//Liquid fuel is used for things that used to rely on volatile fuels or plasma being contained to a couple tiles.
icon = 'icons/effects/effects.dmi'
icon_state = "fuel"
@@ -6,52 +6,53 @@ obj/effect/decal/cleanable/liquid_fuel
anchored = 1
var/amount = 1 //Basically moles.
- New(newLoc,amt=1)
- src.amount = amt
+/obj/effect/decal/cleanable/liquid_fuel/New(newLoc,amt=1)
+ amount = amt
- //Be absorbed by any other liquid fuel in the tile.
- for(var/obj/effect/decal/cleanable/liquid_fuel/other in newLoc)
- if(other != src)
- other.amount += src.amount
- spawn other.Spread()
- qdel(src)
+ //Be absorbed by any other liquid fuel in the tile.
+ for(var/obj/effect/decal/cleanable/liquid_fuel/other in newLoc)
+ if(other != src)
+ other.amount += amount
+ spawn other.Spread()
+ qdel(src)
- Spread()
- . = ..()
+ Spread()
+ . = ..()
- proc/Spread()
- //Allows liquid fuels to sometimes flow into other tiles.
- if(amount < 0.5) return
- var/turf/simulated/S = loc
- if(!istype(S)) return
- for(var/d in cardinal)
- if(rand(25))
- var/turf/simulated/target = get_step(src,d)
- var/turf/simulated/origin = get_turf(src)
- if(origin.CanPass(null, target, 0, 0) && target.CanPass(null, origin, 0, 0))
- if(!locate(/obj/effect/decal/cleanable/liquid_fuel) in target)
- new/obj/effect/decal/cleanable/liquid_fuel(target, amount*0.25)
- amount *= 0.75
+/obj/effect/decal/cleanable/liquid_fuel/proc/Spread()
+ //Allows liquid fuels to sometimes flow into other tiles.
+ if(amount < 0.5) return
+ var/turf/simulated/S = loc
+ if(!istype(S)) return
+ for(var/d in cardinal)
+ if(rand(25))
+ var/turf/simulated/target = get_step(src, d)
+ var/turf/simulated/origin = get_turf(src)
+ if(origin.CanPass(null, target, 0, 0) && target.CanPass(null, origin, 0, 0))
+ if(!locate(/obj/effect/decal/cleanable/liquid_fuel) in target)
+ new/obj/effect/decal/cleanable/liquid_fuel(target, amount*0.25)
+ amount *= 0.75
- flamethrower_fuel
- icon_state = "mustard"
- anchored = 0
- New(newLoc, amt = 1, d = 0)
- dir = d //Setting this direction means you won't get torched by your own flamethrower.
- . = ..()
+/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel
+ icon_state = "mustard"
+ anchored = 0
- Spread()
- //The spread for flamethrower fuel is much more precise, to create a wide fire pattern.
- if(amount < 0.1) return
- var/turf/simulated/S = loc
- if(!istype(S)) return
+/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/New(newLoc, amt = 1, d = 0)
+ dir = d //Setting this direction means you won't get torched by your own flamethrower.
+ . = ..()
- for(var/d in list(turn(dir,90),turn(dir,-90), dir))
- var/turf/simulated/O = get_step(S,d)
- if(locate(/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel) in O)
- continue
- if(O.CanPass(null, S, 0, 0) && S.CanPass(null, O, 0, 0))
- new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(O,amount*0.25,d)
- O.hotspot_expose((T20C*2) + 380,500) //Light flamethrower fuel on fire immediately.
+/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/Spread()
+ //The spread for flamethrower fuel is much more precise, to create a wide fire pattern.
+ if(amount < 0.1) return
+ var/turf/simulated/S = loc
+ if(!istype(S)) return
- amount *= 0.25
+ for(var/d in list(turn(dir,90),turn(dir,-90), dir))
+ var/turf/simulated/O = get_step(S,d)
+ if(locate(/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel) in O)
+ continue
+ if(O.CanPass(null, S, 0, 0) && S.CanPass(null, O, 0, 0))
+ new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(O,amount*0.25,d)
+ O.hotspot_expose((T20C*2) + 380,500) //Light flamethrower fuel on fire immediately.
+
+ amount *= 0.25
diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index 0c0f7cbdf91..ed322d99564 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -118,9 +118,12 @@ var/global/list/image/splatter_cache=list()
user.update_inv_gloves(1)
user.verbs += /mob/living/carbon/human/proc/bloody_doodle
+/obj/effect/decal/cleanable/blood/can_bloodcrawl_in()
+ return TRUE
+
/obj/effect/decal/cleanable/blood/splatter
- random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5")
- amount = 2
+ random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5")
+ amount = 2
/obj/effect/decal/cleanable/blood/drip
name = "drips of blood"
diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm
index 3c0a712a311..1b9880bb79a 100644
--- a/code/game/objects/effects/decals/Cleanable/misc.dm
+++ b/code/game/objects/effects/decals/Cleanable/misc.dm
@@ -89,15 +89,20 @@
/obj/effect/decal/cleanable/cobweb/fire_act()
qdel(src)
-/obj/effect/decal/cleanable/molten_item
+/obj/effect/decal/cleanable/molten_object
name = "gooey grey mass"
desc = "It looks like a melted... something."
density = 0
anchored = 1
layer = 3
- icon = 'icons/obj/chemical.dmi'
+ gender = NEUTER
+ icon = 'icons/effects/effects.dmi'
icon_state = "molten"
+/obj/effect/decal/cleanable/molten_object/large
+ name = "big gooey grey mass"
+ icon_state = "big_molten"
+
/obj/effect/decal/cleanable/cobweb2
name = "cobweb"
desc = "Somebody should remove that."
@@ -145,6 +150,15 @@
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
+/obj/effect/decal/cleanable/plant_smudge
+ name = "plant smudge"
+ density = 0
+ anchored = 1
+ layer = 2
+ gender = NEUTER
+ icon = 'icons/effects/tomatodecal.dmi'
+ random_icon_states = list("smashed_plant")
+
/obj/effect/decal/cleanable/egg_smudge
name = "smashed egg"
desc = "Seems like this one won't hatch."
@@ -163,16 +177,6 @@
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_pie")
-/obj/effect/decal/cleanable/fruit_smudge
- name = "smudge"
- desc = "Some kind of fruit smear."
- density = 0
- anchored = 1
- layer = 2
- icon = 'icons/effects/blood.dmi'
- icon_state = "mfloor1"
- random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7")
-
/obj/effect/decal/cleanable/fungus
name = "space fungus"
desc = "A fungal growth. Looks pretty nasty."
diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm
index 16688932b9c..5fc09b6ec34 100644
--- a/code/game/objects/effects/decals/Cleanable/robots.dm
+++ b/code/game/objects/effects/decals/Cleanable/robots.dm
@@ -11,6 +11,9 @@
/obj/effect/decal/cleanable/blood/gibs/robot/dry() //pieces of robots do not dry up like
return
+
+/obj/effect/decal/cleanable/blood/gibs/robot/can_bloodcrawl_in()
+ return FALSE
/obj/effect/decal/cleanable/blood/gibs/robot/streak(var/list/directions)
spawn (0)
@@ -42,6 +45,9 @@
desc = "It's black and greasy. Looks like Beepsky made another mess."
basecolor="#030303"
+/obj/effect/decal/cleanable/blood/oil/can_bloodcrawl_in()
+ return FALSE
+
/obj/effect/decal/cleanable/blood/oil/dry()
return
diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index 0d6bf3255a5..48a85e7e704 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -3,6 +3,9 @@
var/targeted_by = null // Used so cleanbots can't claim a mess.
var/noscoop = 0 //if it has this, don't let it be scooped up
var/noclear = 0 //if it has this, don't delete it when its' scooped up
+
+/obj/effect/decal/cleanable/proc/can_bloodcrawl_in()
+ return FALSE
/obj/effect/decal/cleanable/New()
if(random_icon_states && length(src.random_icon_states) > 0)
diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index 90e4c47b276..3da7bb372d4 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -425,21 +425,6 @@ steam.start() -- spawns the effect
/obj/effect/effect/chem_smoke/Move()
..()
- return
-
-// Spores
-/datum/effect/system/chem_smoke_spread/spores
- var/datum/seed/seed
-
-/datum/effect/system/chem_smoke_spread/spores/New(seed_name)
- if(seed_name && plant_controller)
- seed = plant_controller.seeds[seed_name]
- if(!seed)
- qdel(src)
- ..()
-
-
-
/datum/effect/system/chem_smoke_spread/New()
..()
chemholder = new/obj()
@@ -517,13 +502,6 @@ steam.start() -- spawns the effect
var/mob/living/carbon/C = A
if(C.can_breathe_gas())
chemholder.reagents.copy_to(C, chemholder.reagents.total_volume)
- if(istype(A, /obj/machinery/portable_atmospherics/hydroponics))
- var/obj/machinery/portable_atmospherics/hydroponics/tray = A
- chemholder.reagents.copy_to(tray, chemholder.reagents.total_volume)
- if(istype(A, /obj/effect/plant))
- var/obj/effect/plant/plant = A
- if(chemholder.reagents.has_reagent("atrazine"))
- plant.die_off()
qdel(smokeholder)
for(i=0, i 20)
@@ -772,7 +750,7 @@ steam.start() -- spawns the effect
var/obj/effect/effect/ion_trails/I = new /obj/effect/effect/ion_trails(src.oldposition)
I.dir = src.holder.dir
flick("ion_fade", I)
- I.icon_state = "blank"
+ I.icon_state = ""
spawn( 20 )
if(I)
I.delete()
@@ -834,8 +812,8 @@ steam.start() -- spawns the effect
II.dir = src.holder.dir
flick("ion_fade", I)
flick("ion_fade", II)
- I.icon_state = "blank"
- II.icon_state = "blank"
+ I.icon_state = ""
+ II.icon_state = ""
spawn( 20 )
if(I) I.delete()
if(II) II.delete()
diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm
index ec77aa2e3a9..21ff80df749 100644
--- a/code/game/objects/effects/glowshroom.dm
+++ b/code/game/objects/effects/glowshroom.dm
@@ -2,32 +2,39 @@
/obj/effect/glowshroom
name = "glowshroom"
+ desc = "Mycena Bregprox, a species of mushroom that glows in the dark."
anchored = 1
opacity = 0
density = 0
icon = 'icons/obj/lighting.dmi'
- icon_state = "glowshroomf"
+ icon_state = "glowshroom" //replaced in New
layer = 2.1
var/endurance = 30
var/potency = 30
var/delay = 1200
var/floor = 0
var/yield = 3
- var/spreadChance = 40
+ var/generation = 1
var/spreadIntoAdjacentChance = 60
- var/evolveChance = 2
- var/lastTick = 0
- var/spreaded = 1
+ light_color = "#006622"
+
+obj/effect/glowshroom/glowcap
+ name = "glowcap"
+ icon_state = "glowcap"
+ light_color = "#8E0300"
/obj/effect/glowshroom/single
- spreadChance = 0
+ yield = 0
+
+/obj/effect/glowshroom/examine(mob/user)
+ . = ..()
+ to_chat(user, "This is a [generation]\th generation [name]!")
/obj/effect/glowshroom/New()
-
..()
-
+ set_light(round(potency/10))
dir = CalcDir()
-
+ var/base_icon_state = initial(icon_state)
if(!floor)
switch(dir) //offset to make it be on the wall rather than on the floor
if(NORTH)
@@ -38,70 +45,52 @@
pixel_x = 32
if(WEST)
pixel_x = -32
- icon_state = "glowshroom[rand(1,3)]"
+ icon_state = "[base_icon_state][rand(1,3)]"
else //if on the floor, glowshroom on-floor sprite
- icon_state = "glowshroomf"
+ icon_state = "[base_icon_state]f"
- processing_objects += src
+ addtimer(src, "Spread", delay)
+/obj/effect/glowshroom/proc/Spread()
+ for(var/i = 1 to yield)
+ if(prob(1/(generation * generation) * 100))//This formula gives you diminishing returns based on generation. 100% with 1st gen, decreasing to 25%, 11%, 6, 4, 2...
+ var/list/possibleLocs = list()
+ var/spreadsIntoAdjacent = FALSE
- set_light(round(potency/10))
- lastTick = world.timeofday
+ if(prob(spreadIntoAdjacentChance))
+ spreadsIntoAdjacent = TRUE
+ for(var/turf/simulated/floor/earth in view(3,src))
+ if(spreadsIntoAdjacent || !locate(/obj/effect/glowshroom) in view(1,earth))
+ possibleLocs += earth
+ CHECK_TICK
-/obj/effect/glowshroom/Destroy()
- processing_objects -= src
- return ..()
+ if(!possibleLocs.len)
+ break
-/obj/effect/glowshroom/process()
- if(!spreaded)
- return
+ var/turf/newLoc = pick(possibleLocs)
- if(((world.timeofday - lastTick) > delay) || ((world.timeofday - lastTick) < 0))
- lastTick = world.timeofday
- spreaded = 0
+ var/shroomCount = 0 //hacky
+ var/placeCount = 1
+ for(var/obj/effect/glowshroom/shroom in newLoc)
+ shroomCount++
+ for(var/wallDir in cardinal)
+ var/turf/isWall = get_step(newLoc,wallDir)
+ if(isWall.density)
+ placeCount++
+ if(shroomCount >= placeCount)
+ continue
- for(var/i=1,i<=yield,i++)
- if(prob(spreadChance))
- var/list/possibleLocs = list()
- var/spreadsIntoAdjacent = 0
+ var/obj/effect/glowshroom/child = new type(newLoc)//The baby mushrooms have different stats :3
+ child.potency = max(potency + rand(-3,6), 0)
+ child.yield = max(yield + rand(-1,2), 0)
+ child.delay = max(delay + rand(-30,60), 0)
+ child.endurance = max(endurance + rand(-3,6), 1)
+ child.generation = generation + 1
- if(prob(spreadIntoAdjacentChance))
- spreadsIntoAdjacent = 1
-
- for(var/turf/simulated/floor/plating/airless/asteroid/earth in view(3,src))
- if(spreadsIntoAdjacent || !locate(/obj/effect/glowshroom) in view(1,earth))
- possibleLocs += earth
-
- if(!possibleLocs.len)
- break
-
- var/turf/newLoc = pick(possibleLocs)
-
- var/shroomCount = 0 //hacky
- var/placeCount = 1
- for(var/obj/effect/glowshroom/shroom in newLoc)
- shroomCount++
- for(var/wallDir in cardinal)
- var/turf/isWall = get_step(newLoc,wallDir)
- if(isWall.density)
- placeCount++
- if(shroomCount >= placeCount)
- continue
-
- var/obj/effect/glowshroom/child = new /obj/effect/glowshroom(newLoc)
- child.potency = potency
- child.yield = yield
- child.delay = delay
- child.endurance = endurance
-
- spreaded++
-
- if(prob(evolveChance)) //very low chance to evolve on its own
- potency += rand(4,6)
+ CHECK_TICK
/obj/effect/glowshroom/proc/CalcDir(turf/location = loc)
- //set background = 1
var/direction = 16
for(var/wallDir in cardinal)
@@ -133,28 +122,22 @@
floor = 1
return 1
-/obj/effect/glowshroom/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/effect/glowshroom/attackby(obj/item/I, mob/user)
..()
-
- endurance -= W.force
-
- CheckEndurance()
+ if(I.damtype != STAMINA)
+ endurance -= I.force
+ CheckEndurance()
/obj/effect/glowshroom/ex_act(severity)
switch(severity)
- if(1.0)
+ if(1)
qdel(src)
- return
- if(2.0)
+ if(2)
if(prob(50))
qdel(src)
- return
- if(3.0)
+ if(3)
if(prob(5))
qdel(src)
- return
- else
- return
/obj/effect/glowshroom/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 300)
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index f46810486ca..7ff80f248da 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -1,252 +1,267 @@
-/obj/effect/landmark
- name = "landmark"
- icon = 'icons/mob/screen_gen.dmi'
- icon_state = "x2"
- anchored = 1.0
- unacidable = 1
-
-/obj/effect/landmark/New()
-
- ..()
- set_tag()
- invisibility = 101
-
- switch(name) //some of these are probably obsolete
- if("start")
- newplayer_start += loc
- qdel(src)
-
- if("wizard")
- wizardstart += loc
- qdel(src)
-
- if("JoinLate")
- latejoin += loc
- qdel(src)
-
- if("JoinLateGateway")
- latejoin_gateway += loc
- qdel(src)
-
- if("JoinLateCryo")
- latejoin_cryo += loc
- qdel(src)
-
- if("JoinLateCyborg")
- latejoin_cyborg += loc
- qdel(src)
-
- if("prisonwarp")
- prisonwarp += loc
- qdel(src)
+/obj/effect/landmark
+ name = "landmark"
+ icon = 'icons/mob/screen_gen.dmi'
+ icon_state = "x2"
+ anchored = 1.0
+ unacidable = 1
- if("prisonsecuritywarp")
- prisonsecuritywarp += loc
- qdel(src)
+/obj/effect/landmark/New()
- if("tdome1")
- tdome1 += loc
+ ..()
+ set_tag()
+ invisibility = 101
- if("tdome2")
- tdome2 += loc
+ switch(name) //some of these are probably obsolete
+ if("start")
+ newplayer_start += loc
+ qdel(src)
- if("tdomeadmin")
- tdomeadmin += loc
+ if("wizard")
+ wizardstart += loc
+ qdel(src)
- if("tdomeobserve")
- tdomeobserve += loc
+ if("JoinLate")
+ latejoin += loc
+ qdel(src)
- if("aroomwarp")
- aroomwarp += loc
-
- if("blobstart")
- blobstart += loc
- qdel(src)
-
- if("xeno_spawn")
- xeno_spawn += loc
- qdel(src)
-
- if("ninjastart")
- ninjastart += loc
- qdel(src)
-
- if("carpspawn")
- carplist += loc
-
- if("voxstart")
- raider_spawn += loc
-
- if("ERT Director")
- ertdirector += loc
- qdel(src)
+ if("JoinLateGateway")
+ latejoin_gateway += loc
+ qdel(src)
- if("Response Team")
- emergencyresponseteamspawn += loc
- qdel(src)
-
- landmarks_list += src
- return 1
-
-/obj/effect/landmark/Destroy()
- landmarks_list -= src
- ..()
- return QDEL_HINT_HARDDEL_NOW
-
-/obj/effect/landmark/proc/set_tag()
- tag = text("landmark*[]", name)
-
-
-/obj/effect/landmark/start
- name = "start"
- icon = 'icons/mob/screen_gen.dmi'
- icon_state = "x"
- anchored = 1.0
-
-/obj/effect/landmark/start/set_tag()
- tag = "start*[name]"
-
-
-//Costume spawner landmarks
-
-/obj/effect/landmark/costume/New() //costume spawner, selects a random subclass and disappears
-
- var/list/options = typesof(/obj/effect/landmark/costume)
- var/PICK= options[rand(1,options.len)]
- new PICK(src.loc)
- qdel(src)
-
-//SUBCLASSES. Spawn a bunch of items and disappear likewise
-/obj/effect/landmark/costume/chicken/New()
- new /obj/item/clothing/suit/chickensuit(src.loc)
- new /obj/item/clothing/head/chicken(src.loc)
- new /obj/item/weapon/reagent_containers/food/snacks/egg(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/gladiator/New()
- new /obj/item/clothing/under/gladiator(src.loc)
- new /obj/item/clothing/head/helmet/gladiator(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/madscientist/New()
- new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
- new /obj/item/clothing/head/flatcap(src.loc)
- new /obj/item/clothing/suit/storage/labcoat/mad(src.loc)
- new /obj/item/clothing/glasses/gglasses(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/elpresidente/New()
- new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
- new /obj/item/clothing/head/flatcap(src.loc)
- new /obj/item/clothing/mask/cigarette/cigar/havana(src.loc)
- new /obj/item/clothing/shoes/jackboots(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/nyangirl/New()
- new /obj/item/clothing/under/schoolgirl(src.loc)
- new /obj/item/clothing/head/kitty(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/maid/New()
- new /obj/item/clothing/under/blackskirt(src.loc)
- var/CHOICE = pick( /obj/item/clothing/head/beret , /obj/item/clothing/head/rabbitears )
- new CHOICE(src.loc)
- new /obj/item/clothing/glasses/sunglasses/blindfold(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/butler/New()
- new /obj/item/clothing/suit/wcoat(src.loc)
- new /obj/item/clothing/under/suit_jacket(src.loc)
- new /obj/item/clothing/head/that(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/scratch/New()
- new /obj/item/clothing/gloves/color/white(src.loc)
- new /obj/item/clothing/shoes/white(src.loc)
- new /obj/item/clothing/under/scratch(src.loc)
- if(prob(30))
- new /obj/item/clothing/head/cueball(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/highlander/New()
- new /obj/item/clothing/under/kilt(src.loc)
- new /obj/item/clothing/head/beret(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/prig/New()
- new /obj/item/clothing/suit/wcoat(src.loc)
- new /obj/item/clothing/glasses/monocle(src.loc)
- var/CHOICE= pick( /obj/item/clothing/head/bowlerhat, /obj/item/clothing/head/that)
- new CHOICE(src.loc)
- new /obj/item/clothing/shoes/black(src.loc)
- new /obj/item/weapon/cane(src.loc)
- new /obj/item/clothing/under/sl_suit(src.loc)
- new /obj/item/clothing/mask/fakemoustache(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/plaguedoctor/New()
- new /obj/item/clothing/suit/bio_suit/plaguedoctorsuit(src.loc)
- new /obj/item/clothing/head/plaguedoctorhat(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/nightowl/New()
- new /obj/item/clothing/under/owl(src.loc)
- new /obj/item/clothing/mask/gas/owl_mask(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/waiter/New()
- new /obj/item/clothing/under/waiter(src.loc)
- var/CHOICE= pick( /obj/item/clothing/head/kitty, /obj/item/clothing/head/rabbitears)
- new CHOICE(src.loc)
- new /obj/item/clothing/suit/apron(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/pirate/New()
- new /obj/item/clothing/under/pirate(src.loc)
- new /obj/item/clothing/suit/pirate_black(src.loc)
- var/CHOICE = pick( /obj/item/clothing/head/pirate , /obj/item/clothing/head/bandana )
- new CHOICE(src.loc)
- new /obj/item/clothing/glasses/eyepatch(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/commie/New()
- new /obj/item/clothing/under/soviet(src.loc)
- new /obj/item/clothing/head/ushanka(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/imperium_monk/New()
- new /obj/item/clothing/suit/imperium_monk(src.loc)
- if(prob(25))
- new /obj/item/clothing/mask/gas/cyborg(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/holiday_priest/New()
- new /obj/item/clothing/suit/holidaypriest(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/marisawizard/fake/New()
- new /obj/item/clothing/head/wizard/marisa/fake(src.loc)
- new/obj/item/clothing/suit/wizrobe/marisa/fake(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/cutewitch/New()
- new /obj/item/clothing/under/sundress(src.loc)
- new /obj/item/clothing/head/witchwig(src.loc)
- new /obj/item/weapon/twohanded/staff/broom(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/fakewizard/New()
- new /obj/item/clothing/suit/wizrobe/fake(src.loc)
- new /obj/item/clothing/head/wizard/fake(src.loc)
- new /obj/item/weapon/twohanded/staff/(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/sexyclown/New()
- new /obj/item/clothing/mask/gas/sexyclown(src.loc)
- new /obj/item/clothing/under/sexyclown(src.loc)
- qdel(src)
-
-/obj/effect/landmark/costume/sexymime/New()
- new /obj/item/clothing/mask/gas/sexymime(src.loc)
- new /obj/item/clothing/under/sexymime(src.loc)
- qdel(src)
+ if("JoinLateCryo")
+ latejoin_cryo += loc
+ qdel(src)
+
+ if("JoinLateCyborg")
+ latejoin_cyborg += loc
+ qdel(src)
+
+ if("prisonwarp")
+ prisonwarp += loc
+ qdel(src)
+
+ if("prisonsecuritywarp")
+ prisonsecuritywarp += loc
+ qdel(src)
+
+ if("tdome1")
+ tdome1 += loc
+
+ if("tdome2")
+ tdome2 += loc
+
+ if("tdomeadmin")
+ tdomeadmin += loc
+
+ if("tdomeobserve")
+ tdomeobserve += loc
+
+ if("aroomwarp")
+ aroomwarp += loc
+
+ if("blobstart")
+ blobstart += loc
+ qdel(src)
+
+ if("xeno_spawn")
+ xeno_spawn += loc
+ qdel(src)
+
+ if("ninjastart")
+ ninjastart += loc
+ qdel(src)
+
+ if("carpspawn")
+ carplist += loc
+
+ if("voxstart")
+ raider_spawn += loc
+
+ if("ERT Director")
+ ertdirector += loc
+ qdel(src)
+
+ if("Response Team")
+ emergencyresponseteamspawn += loc
+ qdel(src)
+
+ landmarks_list += src
+ return 1
+
+/obj/effect/landmark/Destroy()
+ landmarks_list -= src
+ ..()
+ return QDEL_HINT_HARDDEL_NOW
+
+/obj/effect/landmark/proc/set_tag()
+ tag = text("landmark*[]", name)
+
+
+/obj/effect/landmark/start
+ name = "start"
+ icon = 'icons/mob/screen_gen.dmi'
+ icon_state = "x"
+ anchored = 1.0
+
+/obj/effect/landmark/start/set_tag()
+ tag = "start*[name]"
+
+
+//Costume spawner landmarks
+
+/obj/effect/landmark/costume/New() //costume spawner, selects a random subclass and disappears
+
+ var/list/options = typesof(/obj/effect/landmark/costume)
+ var/PICK= options[rand(1,options.len)]
+ new PICK(src.loc)
+ qdel(src)
+
+//SUBCLASSES. Spawn a bunch of items and disappear likewise
+/obj/effect/landmark/costume/chicken/New()
+ new /obj/item/clothing/suit/chickensuit(src.loc)
+ new /obj/item/clothing/head/chicken(src.loc)
+ new /obj/item/weapon/reagent_containers/food/snacks/egg(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/gladiator/New()
+ new /obj/item/clothing/under/gladiator(src.loc)
+ new /obj/item/clothing/head/helmet/gladiator(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/madscientist/New()
+ new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
+ new /obj/item/clothing/head/flatcap(src.loc)
+ new /obj/item/clothing/suit/storage/labcoat/mad(src.loc)
+ new /obj/item/clothing/glasses/gglasses(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/elpresidente/New()
+ new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
+ new /obj/item/clothing/head/flatcap(src.loc)
+ new /obj/item/clothing/mask/cigarette/cigar/havana(src.loc)
+ new /obj/item/clothing/shoes/jackboots(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/nyangirl/New()
+ new /obj/item/clothing/under/schoolgirl(src.loc)
+ new /obj/item/clothing/head/kitty(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/maid/New()
+ new /obj/item/clothing/under/blackskirt(src.loc)
+ var/CHOICE = pick( /obj/item/clothing/head/beret , /obj/item/clothing/head/rabbitears )
+ new CHOICE(src.loc)
+ new /obj/item/clothing/glasses/sunglasses/blindfold(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/butler/New()
+ new /obj/item/clothing/suit/wcoat(src.loc)
+ new /obj/item/clothing/under/suit_jacket(src.loc)
+ new /obj/item/clothing/head/that(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/scratch/New()
+ new /obj/item/clothing/gloves/color/white(src.loc)
+ new /obj/item/clothing/shoes/white(src.loc)
+ new /obj/item/clothing/under/scratch(src.loc)
+ if(prob(30))
+ new /obj/item/clothing/head/cueball(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/highlander/New()
+ new /obj/item/clothing/under/kilt(src.loc)
+ new /obj/item/clothing/head/beret(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/prig/New()
+ new /obj/item/clothing/suit/wcoat(src.loc)
+ new /obj/item/clothing/glasses/monocle(src.loc)
+ var/CHOICE= pick( /obj/item/clothing/head/bowlerhat, /obj/item/clothing/head/that)
+ new CHOICE(src.loc)
+ new /obj/item/clothing/shoes/black(src.loc)
+ new /obj/item/weapon/cane(src.loc)
+ new /obj/item/clothing/under/sl_suit(src.loc)
+ new /obj/item/clothing/mask/fakemoustache(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/plaguedoctor/New()
+ new /obj/item/clothing/suit/bio_suit/plaguedoctorsuit(src.loc)
+ new /obj/item/clothing/head/plaguedoctorhat(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/nightowl/New()
+ new /obj/item/clothing/under/owl(src.loc)
+ new /obj/item/clothing/mask/gas/owl_mask(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/waiter/New()
+ new /obj/item/clothing/under/waiter(src.loc)
+ var/CHOICE= pick( /obj/item/clothing/head/kitty, /obj/item/clothing/head/rabbitears)
+ new CHOICE(src.loc)
+ new /obj/item/clothing/suit/apron(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/pirate/New()
+ new /obj/item/clothing/under/pirate(src.loc)
+ new /obj/item/clothing/suit/pirate_black(src.loc)
+ var/CHOICE = pick( /obj/item/clothing/head/pirate , /obj/item/clothing/head/bandana )
+ new CHOICE(src.loc)
+ new /obj/item/clothing/glasses/eyepatch(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/commie/New()
+ new /obj/item/clothing/under/soviet(src.loc)
+ new /obj/item/clothing/head/ushanka(src.loc)
+ qdel(src)
+
+
+/obj/effect/landmark/costume/imperium_monk/New()
+ new /obj/item/clothing/suit/imperium_monk(src.loc)
+ if(prob(25))
+ new /obj/item/clothing/mask/gas/cyborg(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/holiday_priest/New()
+ new /obj/item/clothing/suit/holidaypriest(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/marisawizard/fake/New()
+ new /obj/item/clothing/head/wizard/marisa/fake(src.loc)
+ new/obj/item/clothing/suit/wizrobe/marisa/fake(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/cutewitch/New()
+ new /obj/item/clothing/under/sundress(src.loc)
+ new /obj/item/clothing/head/witchwig(src.loc)
+ new /obj/item/weapon/twohanded/staff/broom(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/fakewizard/New()
+ new /obj/item/clothing/suit/wizrobe/fake(src.loc)
+ new /obj/item/clothing/head/wizard/fake(src.loc)
+ new /obj/item/weapon/twohanded/staff/(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/sexyclown/New()
+ new /obj/item/clothing/mask/gas/sexyclown(src.loc)
+ new /obj/item/clothing/under/sexyclown(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/costume/sexymime/New()
+ new /obj/item/clothing/mask/gas/sexymime(src.loc)
+ new /obj/item/clothing/under/sexymime(src.loc)
+ qdel(src)
+
+/obj/effect/landmark/ruin
+ var/datum/map_template/ruin/ruin_template
+
+/obj/effect/landmark/ruin/New(loc, my_ruin_template)
+ name = "ruin_[ruin_landmarks.len + 1]"
+ ..(loc)
+ ruin_template = my_ruin_template
+ ruin_landmarks |= src
+
+/obj/effect/landmark/ruin/Destroy()
+ ruin_landmarks -= src
+ ruin_template = null
+ . = ..()
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index c9cb0c62eab..c3facb6ccbe 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -1,94 +1,168 @@
/obj/effect/mine
- name = "Mine"
+ name = "dummy mine"
desc = "I Better stay away from that thing."
- density = 1
+ density = 0
anchored = 1
- layer = 3
icon = 'icons/obj/weapons.dmi'
- icon_state = "uglymine"
- var/triggerproc = "explode" //name of the proc thats called when the mine is triggered
+ icon_state = "uglyminearmed"
var/triggered = 0
-/obj/effect/mine/New()
- icon_state = "uglyminearmed"
+/obj/effect/mine/proc/mineEffect(mob/living/victim)
+ to_chat(victim, "*click*")
/obj/effect/mine/Crossed(AM as mob|obj)
- Bumped(AM)
+ if(!isliving(AM))
+ return
+ if(isanimal(AM))
+ var/mob/living/simple_animal/SA = AM
+ if(!SA.flying)
+ triggermine(SA)
+ else
+ triggermine(AM)
-/obj/effect/mine/Bumped(mob/M as mob|obj)
-
- if(triggered) return
-
- if(istype(M, /mob/living/carbon/human))
- for(var/mob/O in viewers(world.view, src.loc))
- to_chat(O, "[M] triggered the [bicon(src)] [src]")
- triggered = 1
- call(src,triggerproc)(M)
-
-/obj/effect/mine/proc/triggerrad(obj)
+/obj/effect/mine/proc/triggermine(mob/living/victim)
+ if(triggered)
+ return
+ visible_message("[victim] sets off \icon[src] [src]!")
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
- obj:radiation += 50
- randmutb(obj)
- domutcheck(obj,null)
- spawn(0)
- qdel(src)
+ mineEffect(victim)
+ triggered = 1
+ qdel(src)
-/obj/effect/mine/proc/triggerstun(obj)
- if(ismob(obj))
- var/mob/M = obj
- M.Stun(30)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
- s.set_up(3, 1, src)
- s.start()
- spawn(0)
- qdel(src)
+/obj/effect/mine/explosive
+ name = "explosive mine"
+ var/range_devastation = 0
+ var/range_heavy = 1
+ var/range_light = 2
+ var/range_flash = 3
-/obj/effect/mine/proc/triggern2o(obj)
- atmos_spawn_air(SPAWN_N2O, 360)
- spawn(0)
- qdel(src)
+/obj/effect/mine/explosive/mineEffect(mob/living/victim)
+ explosion(loc, range_devastation, range_heavy, range_light, range_flash)
-/obj/effect/mine/proc/triggerplasma(obj)
- atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 360)
- spawn(0)
- qdel(src)
+/obj/effect/mine/stun
+ name = "stun mine"
+ var/stun_time = 8
-/obj/effect/mine/proc/triggerkick(obj)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
- s.set_up(3, 1, src)
- s.start()
- qdel(obj:client)
- spawn(0)
- qdel(src)
-
-/obj/effect/mine/proc/explode(obj)
- explosion(loc, 0, 1, 2, 3)
- spawn(0)
- qdel(src)
+/obj/effect/mine/stun/mineEffect(mob/living/victim)
+ if(isliving(victim))
+ victim.Weaken(stun_time)
/obj/effect/mine/dnascramble
name = "Radiation Mine"
- icon_state = "uglymine"
- triggerproc = "triggerrad"
+ var/radiation_amount
-/obj/effect/mine/plasma
- name = "Plasma Mine"
- icon_state = "uglymine"
- triggerproc = "triggerplasma"
+/obj/effect/mine/dnascramble/mineEffect(mob/living/victim)
+ victim.apply_effect(radiation_amount, IRRADIATE, 0)
+ randmutb(victim)
+ domutcheck(victim ,null)
-/obj/effect/mine/kick
- name = "Kick Mine"
- icon_state = "uglymine"
- triggerproc = "triggerkick"
+/obj/effect/mine/gas
+ name = "oxygen mine"
+ var/gas_amount = 360
+ var/gas_type = SPAWN_OXYGEN
-/obj/effect/mine/n2o
- name = "N2O Mine"
- icon_state = "uglymine"
- triggerproc = "triggern2o"
+/obj/effect/mine/gas/mineEffect(mob/living/victim)
+ atmos_spawn_air(gas_type, gas_amount)
-/obj/effect/mine/stun
- name = "Stun Mine"
- icon_state = "uglymine"
- triggerproc = "triggerstun"
+/obj/effect/mine/gas/plasma
+ name = "plasma mine"
+ gas_type = SPAWN_HEAT | SPAWN_TOXINS
+
+/obj/effect/mine/gas/n2o
+ name = "\improper N2O mine"
+ gas_type = SPAWN_N2O
+
+/obj/effect/mine/sound
+ name = "honkblaster 1000"
+ var/sound = 'sound/items/bikehorn.ogg'
+
+/obj/effect/mine/sound/mineEffect(mob/living/victim)
+ playsound(loc, sound, 100, 1)
+
+/obj/effect/mine/sound/bwoink
+ name = "bwoink mine"
+ sound = 'sound/effects/adminhelp.ogg'
+
+/obj/effect/mine/pickup
+ name = "pickup"
+ desc = "pick me up"
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "electricity2"
+ density = 0
+ var/duration = 0
+
+/obj/effect/mine/pickup/New()
+ ..()
+ animate(src, pixel_y = 4, time = 20, loop = -1)
+
+/obj/effect/mine/pickup/triggermine(mob/living/victim)
+ if(triggered)
+ return
+ triggered = 1
+ invisibility = 101
+ mineEffect(victim)
+ qdel(src)
+
+/obj/effect/mine/pickup/bloodbath
+ name = "Red Orb"
+ desc = "You feel angry just looking at it."
+ duration = 1200 //2min
+ color = "red"
+
+/obj/effect/mine/pickup/bloodbath/mineEffect(mob/living/carbon/victim)
+ if(!istype(victim) || !victim.client)
+ return
+ to_chat(victim, "RIP AND TEAR")
+ victim << 'sound/misc/e1m1.ogg'
+ var/old_color = victim.client.color
+ var/red_splash = list(1,0,0,0.8,0.2,0, 0.8,0,0.2,0.1,0,0)
+ var/pure_red = list(0,0,0,0,0,0,0,0,0,1,0,0)
+
+ spawn(0)
+ new /obj/effect/hallucination/delusion(victim.loc, victim, force_kind = "demon", duration = duration, skip_nearby = 0)
+
+ var/obj/item/weapon/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc)
+ chainsaw.flags |= NODROP
+ victim.drop_l_hand()
+ victim.drop_r_hand()
+ victim.put_in_hands(chainsaw)
+ chainsaw.attack_self(victim)
+ chainsaw.wield(victim)
+ victim.reagents.add_reagent("adminordrazine", 25)
+
+ victim.client.color = pure_red
+ animate(victim.client,color = red_splash, time = 10, easing = SINE_EASING|EASE_OUT)
+ spawn(10)
+ animate(victim.client,color = old_color, time = duration)//, easing = SINE_EASING|EASE_OUT)
+ spawn(duration)
+ to_chat(victim, "Your bloodlust seeps back into the bog of your subconscious and you regain self control.")
+ qdel(chainsaw)
+ qdel(src)
+
+/obj/effect/mine/pickup/healing
+ name = "Blue Orb"
+ desc = "You feel better just looking at it."
+ color = "blue"
+
+/obj/effect/mine/pickup/healing/mineEffect(mob/living/carbon/victim)
+ if(!victim.client || !istype(victim))
+ return
+ to_chat(victim, "You feel great!")
+ victim.revive()
+
+/obj/effect/mine/pickup/speed
+ name = "Yellow Orb"
+ desc = "You feel faster just looking at it."
+ color = "yellow"
+ duration = 300
+
+/obj/effect/mine/pickup/speed/mineEffect(mob/living/carbon/victim)
+ if(!victim.client || !istype(victim))
+ return
+ to_chat(victim, "You feel fast!")
+ victim.status_flags |= GOTTAGOREALLYFAST
+ spawn(duration)
+ victim.status_flags &= ~GOTTAGOREALLYFAST
+ to_chat(victim, "You slow down.")
\ No newline at end of file
diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
index 94967f60c95..0bb6278c0bc 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -1,4 +1,3 @@
-
/obj/effect/overlay
name = "overlay"
unacidable = 1
@@ -17,60 +16,9 @@
var/tmp/atom/BeamSource
New()
..()
- spawn(10) qdel(src)
-
-
-/obj/effect/overlay/temp
- anchored = 1
- layer = 4.1
- mouse_opacity = 0
- var/duration = 10
- var/randomdir = 1
-
-/obj/effect/overlay/temp/New()
- if(randomdir)
- dir = pick(cardinal)
- spawn(duration)
- qdel(src)
-
-/obj/effect/overlay/temp/revenant
- name = "spooky lights"
- icon = 'icons/effects/effects.dmi'
- icon_state = "purplesparkles"
-
-/obj/effect/overlay/temp/revenant/cracks
- name = "glowing cracks"
- icon_state = "purplecrack"
- duration = 6
-
-/obj/effect/overlay/temp/guardian
- randomdir = 0
-
-/obj/effect/overlay/temp/guardian/phase
- duration = 5
- icon_state = "phasein"
-
-/obj/effect/overlay/temp/guardian/phase/out
- icon_state = "phaseout"
-
-/obj/effect/overlay/temp/emp
- name = "emp sparks"
- icon = 'icons/effects/effects.dmi'
- icon_state = "empdisable"
-
-/obj/effect/overlay/temp/emp/pulse
- name = "emp pulse"
- icon_state = "emp pulse"
- duration = 8
- randomdir = 0
-
-/obj/effect/overlay/temp/kinetic_blast
- name = "kinetic explosion"
- icon = 'icons/obj/projectiles.dmi'
- icon_state = "kinetic_blast"
- layer = 4.1
- duration = 4
-
+ spawn(10)
+ qdel(src)
+
/obj/effect/overlay/palmtree_r
name = "Palm tree"
icon = 'icons/misc/beach2.dmi'
@@ -98,6 +46,164 @@
icon_state = "admin"
layer = 4.1
+/obj/effect/overlay/temp
+ anchored = 1
+ layer = 4.1
+ mouse_opacity = 0
+ var/duration = 10
+ var/randomdir = 1
+
+/obj/effect/overlay/temp/New()
+ if(randomdir)
+ dir = pick(cardinal)
+
+ flick("[icon_state]", src) //Because we might be pulling it from a pool, flick whatever icon it uses so it starts at the start of the icon's animation.
+
+ spawn(duration)
+ qdel(src)
+
+/obj/effect/overlay/temp/revenant
+ name = "spooky lights"
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "purplesparkles"
+
+/obj/effect/overlay/temp/revenant/cracks
+ name = "glowing cracks"
+ icon_state = "purplecrack"
+ duration = 6
+
+/obj/effect/overlay/temp/guardian
+ randomdir = 0
+
+/obj/effect/overlay/temp/guardian/phase
+ duration = 5
+ icon_state = "phasein"
+
+/obj/effect/overlay/temp/guardian/phase/out
+ icon_state = "phaseout"
+
+/obj/effect/overlay/temp/emp
+ name = "emp sparks"
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "empdisable"
+
+/obj/effect/overlay/temp/emp/pulse
+ name = "emp pulse"
+ icon_state = "emppulse"
+ duration = 8
+ randomdir = 0
+
+/obj/effect/overlay/temp/heal //color is white by default, set to whatever is needed
+ name = "healing glow"
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "heal"
+ duration = 15
+
+/obj/effect/overlay/temp/heal/New(loc, colour)
+ ..()
+ pixel_x = rand(-12, 12)
+ pixel_y = rand(-9, 0)
+ if(colour)
+ color = colour
+
+/obj/effect/overlay/temp/kinetic_blast
+ name = "kinetic explosion"
+ icon = 'icons/obj/projectiles.dmi'
+ icon_state = "kinetic_blast"
+ layer = 4.1
+ duration = 4
+
+/obj/effect/overlay/temp/explosion
+ name = "explosion"
+ icon = 'icons/effects/96x96.dmi'
+ icon_state = "explosion"
+ pixel_x = -32
+ pixel_y = -32
+ duration = 8
+
+/obj/effect/overlay/temp/explosion/fast
+ icon_state = "explosionfast"
+ duration = 4
+
+/obj/effect/overlay/temp/decoy
+ desc = "It's a decoy!"
+ duration = 15
+
+/obj/effect/overlay/temp/decoy/New(loc, atom/mimiced_atom)
+ ..()
+ alpha = initial(alpha)
+ if(mimiced_atom)
+ name = mimiced_atom.name
+ appearance = mimiced_atom.appearance
+ dir = mimiced_atom.dir
+ mouse_opacity = 0
+
+/obj/effect/overlay/temp/decoy/fading/New(loc, atom/mimiced_atom)
+ ..()
+ animate(src, alpha = 0, time = duration)
+
+/obj/effect/overlay/temp/cult
+ icon = 'icons/effects/effects.dmi'
+ randomdir = 0
+ duration = 10
+
+/obj/effect/overlay/temp/cult/sparks
+ randomdir = 1
+ name = "blood sparks"
+ icon_state = "bloodsparkles"
+
+/obj/effect/overlay/temp/dir_setting
+ randomdir = FALSE
+
+/obj/effect/overlay/temp/dir_setting/New(loc, set_dir)
+ if(set_dir)
+ dir = set_dir
+ ..()
+
+/obj/effect/overlay/temp/dir_setting/bloodsplatter
+ icon = 'icons/effects/blood.dmi'
+ duration = 5
+ randomdir = FALSE
+ layer = MOB_LAYER - 0.1
+ var/splatter_type = "splatter"
+
+/obj/effect/overlay/temp/dir_setting/bloodsplatter/New(loc, set_dir)
+ if(set_dir in diagonals)
+ icon_state = "[splatter_type][pick(1, 2, 6)]"
+ else
+ icon_state = "[splatter_type][pick(3, 4, 5)]"
+ ..()
+ var/target_pixel_x = 0
+ var/target_pixel_y = 0
+ switch(set_dir)
+ if(NORTH)
+ target_pixel_y = 16
+ if(SOUTH)
+ target_pixel_y = -16
+ layer = MOB_LAYER + 0.1
+ if(EAST)
+ target_pixel_x = 16
+ if(WEST)
+ target_pixel_x = -16
+ if(NORTHEAST)
+ target_pixel_x = 16
+ target_pixel_y = 16
+ if(NORTHWEST)
+ target_pixel_x = -16
+ target_pixel_y = 16
+ if(SOUTHEAST)
+ target_pixel_x = 16
+ target_pixel_y = -16
+ layer = MOB_LAYER + 0.1
+ if(SOUTHWEST)
+ target_pixel_x = -16
+ target_pixel_y = -16
+ layer = MOB_LAYER + 0.1
+ animate(src, pixel_x = target_pixel_x, pixel_y = target_pixel_y, alpha = 0, time = duration)
+
+/obj/effect/overlay/temp/dir_setting/bloodsplatter/xenosplatter
+ splatter_type = "xsplatter"
+
/obj/effect/overlay/wall_rot
name = "Wallrot"
desc = "Ick..."
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 0293231c60e..b9804e7d9a5 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -103,8 +103,8 @@
/obj/item/weapon/hand_labeler = 10,
/obj/item/weapon/paper/crumpled = 10,
/obj/item/weapon/pen = 10,
- /obj/item/weapon/minihoe = 10,
- /obj/item/weapon/plantspray/pests = 10,
+ /obj/item/weapon/cultivator = 10,
+ /obj/item/weapon/reagent_containers/spray/pestspray = 10,
/obj/item/weapon/stock_parts/cell = 30,
/obj/item/weapon/storage/belt/utility = 20,
/obj/item/weapon/storage/box = 20,
@@ -122,13 +122,13 @@
/obj/item/weapon/wrench = 40,
/obj/item/weapon/relic = 35,
/obj/item/clothing/shoes/brown = 30,
- /obj/item/seeds/ambrosiadeusseed = 10,
- /obj/item/seeds/ambrosiavulgarisseed = 20,
+ /obj/item/seeds/ambrosia/deus = 10,
+ /obj/item/seeds/ambrosia = 20,
/obj/item/clothing/under/color/black = 30,
/obj/item/stack/tape_roll = 10,
////////////////CONTRABAND STUFF//////////////////
/obj/item/weapon/grenade/clown_grenade = 3,
- /obj/item/seeds/ambrosiavulgarisseed/cruciatus = 3,
+ /obj/item/seeds/ambrosia/cruciatus = 3,
/obj/item/weapon/gun/projectile/automatic/pistol/empty = 1,
/obj/item/ammo_box/magazine/m10mm = 4,
/obj/item/weapon/soap/syndie = 7,
@@ -194,6 +194,6 @@
/obj/item/weapon/stock_parts/scanning_module = 1,
/obj/item/weapon/spacecash/c200 = 1,
/obj/item/weapon/airlock_electronics = 1,
- /obj/item/weapon/gun/energy/kinetic_accelerator/super = 1,
+ /obj/item/weapon/gun/energy/kinetic_accelerator = 1,
/obj/item/pizzabox = 3,
)
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index 198c6ce45aa..3cc0f9b6023 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -53,7 +53,7 @@
By submitting this form, you accept any fines, fees, or personal injury/death that may occur during construction."
w_class = 1
-/obj/item/areaeditor/permit/attack_self(mob/user as mob)
+/obj/item/areaeditor/permit/attack_self(mob/user)
. = ..()
var/area/A = get_area()
if(get_area_type() == AREA_STATION)
@@ -85,7 +85,7 @@
return ..()
-/obj/item/areaeditor/blueprints/attack_self(mob/user as mob)
+/obj/item/areaeditor/blueprints/attack_self(mob/user)
. = ..()
var/area/A = get_area()
if(get_area_type() == AREA_STATION)
@@ -153,7 +153,7 @@
/obj/item/areaeditor/proc/get_area_type(var/area/A = get_area())
- if(istype(A,/area/space))
+ if(A.outdoors)
return AREA_SPACE
var/list/SPECIALS = list(
/area/shuttle,
@@ -305,3 +305,10 @@
return ROOM_ERR_SPACE
found+=T
return found
+
+//Blueprint Subtypes
+
+/obj/item/areaeditor/blueprints/cyborg
+ name = "station schematics"
+ desc = "A digital copy of the station blueprints stored in your memory."
+ fluffnotice = "Intellectual Property of Nanotrasen. For use in engineering cyborgs only. Wipe from memory upon departure from the station."
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index d805105a906..2a2237559fb 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -77,7 +77,7 @@
drawtype = temp
update_window(usr)
-/obj/item/toy/crayon/afterattack(atom/target, mob/user as mob, proximity)
+/obj/item/toy/crayon/afterattack(atom/target, mob/user, proximity)
if(!proximity) return
if(is_type_in_list(target,validSurfaces))
var/temp = "rune"
@@ -95,17 +95,22 @@
if(!uses)
to_chat(user, "You used up your [name]!")
qdel(src)
- return
-/obj/item/toy/crayon/attack(mob/M as mob, mob/user as mob)
+/obj/item/toy/crayon/attack(mob/M, mob/user)
var/huffable = istype(src,/obj/item/toy/crayon/spraycan)
if(M == user)
- to_chat(user, "You take a [huffable ? "huff" : "bite"] of the [name]. Delicious!")
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ if(!H.check_has_mouth())
+ to_chat(user, "You do not have a mouth!")
+ return
+ playsound(loc, 'sound/items/eatfood.ogg', 50, 0)
+ to_chat(user, "You take a [huffable ? "huff" : "bite"] of the [name]. Delicious!")
user.nutrition += 5
if(uses)
uses -= 5
if(uses <= 0)
- to_chat(user, "There is no more of [name] left!")
+ to_chat(user, "There is no more of [name] left!")
qdel(src)
else
..()
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 7806982a627..216c37e7a51 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -54,8 +54,8 @@
return
var/mob/living/carbon/human/H = M //mob has protective eyewear
- if(istype(M, /mob/living/carbon/human) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES)))
- to_chat(user, "You're going to need to remove that [(H.head && H.head.flags & HEADCOVERSEYES) ? "helmet" : (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) ? "mask": "glasses"] first.")
+ if(istype(H) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES)))
+ to_chat(user, "You're going to need to remove that [(H.head && H.head.flags & HEADCOVERSEYES) ? "helmet" : (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) ? "mask" : "glasses"] first.")
return
if(M == user) //they're using it on themselves
@@ -70,12 +70,13 @@
user.visible_message("[user] directs [src] to [M]'s eyes.", \
"You direct [src] to [M]'s eyes.")
- if(istype(M, /mob/living/carbon/human)) //robots and aliens are unaffected
- if(M.stat == DEAD || M.disabilities & BLIND) //mob is dead or fully blind
- to_chat(user, "[M] pupils does not react to the light!")
- else if(XRAY in M.mutations) //mob has X-RAY vision
- to_chat(user, "[M] pupils give an eerie glow!")
- else //they're okay!
+ if(istype(H)) //robots and aliens are unaffected
+ var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes)
+ if(M.stat == DEAD || !eyes || M.disabilities & BLIND) //mob is dead or fully blind
+ to_chat(user, "[M]'s pupils are unresponsive to the light!")
+ else if((XRAY in M.mutations) || (eyes.colourblind_darkview && eyes.colourblind_darkview == eyes.get_dark_view())) //The mob's either got the X-RAY vision or has a tapetum lucidum (extreme nightvision, i.e. Vulp/Tajara with COLOURBLIND & their monkey forms).
+ to_chat(user, "[M]'s pupils glow eerily!")
+ else //they're okay!
if(M.flash_eyes(visual = 1))
to_chat(user, "[M]'s pupils narrow.")
else
diff --git a/code/game/objects/items/devices/guitar.dm b/code/game/objects/items/devices/guitar.dm
index eaf1c668e3c..bb11c5f0a2a 100644
--- a/code/game/objects/items/devices/guitar.dm
+++ b/code/game/objects/items/devices/guitar.dm
@@ -25,10 +25,7 @@
ui_interact(user)
/obj/item/device/guitar/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
- if(!user)
- return
-
- if(!isliving(user) || user.stat || user.restrained() || user.lying)
+ if(!isliving(user) || user.incapacitated())
return
song.ui_interact(user, ui_key, ui, force_open)
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index 68b0b8d2dca..ab61008816c 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -11,11 +11,16 @@
var/obj/item/device/radio/radio
var/looking_for_personality = 0
var/mob/living/silicon/pai/pai
+ var/list/faction = list("neutral") // The factions the pAI will inherit from the card
+
+/obj/item/device/paicard/syndicate
+ name = "syndicate personal AI device"
+ faction = list("syndicate")
/obj/item/device/paicard/relaymove(var/mob/user, var/direction)
if(user.stat || user.stunned)
return
- var/obj/item/weapon/rig/rig = src.get_rig()
+ var/obj/item/weapon/rig/rig = get_rig()
if(istype(rig))
rig.forced_move(direction, user)
@@ -260,7 +265,7 @@
to_chat(usr, "\red The request system is currently offline. Please wait another [cooldown_time] seconds.")
return
last_request = world.time / 10
- src.looking_for_personality = 1
+ looking_for_personality = 1
paiController.findPAI(src, usr)
if(href_list["wipe"])
var/confirm = input("Are you CERTAIN you wish to delete the current personality? This action cannot be undone.", "Personality Wipe") in list("Yes", "No")
@@ -297,33 +302,33 @@
// WIRE_TRANSMIT = 4
/obj/item/device/paicard/proc/setPersonality(mob/living/silicon/pai/personality)
- src.pai = personality
- src.overlays += "pai-happy"
+ pai = personality
+ overlays += "pai-happy"
/obj/item/device/paicard/proc/removePersonality()
- src.pai = null
- src.overlays.Cut()
- src.overlays += "pai-off"
+ pai = null
+ overlays.Cut()
+ overlays += "pai-off"
/obj/item/device/paicard
var/current_emotion = 1
/obj/item/device/paicard/proc/setEmotion(var/emotion)
if(pai)
- src.overlays.Cut()
+ overlays.Cut()
switch(emotion)
- if(1) src.overlays += "pai-happy"
- if(2) src.overlays += "pai-cat"
- if(3) src.overlays += "pai-extremely-happy"
- if(4) src.overlays += "pai-face"
- if(5) src.overlays += "pai-laugh"
- if(6) src.overlays += "pai-off"
- if(7) src.overlays += "pai-sad"
- if(8) src.overlays += "pai-angry"
- if(9) src.overlays += "pai-what"
+ if(1) overlays += "pai-happy"
+ if(2) overlays += "pai-cat"
+ if(3) overlays += "pai-extremely-happy"
+ if(4) overlays += "pai-face"
+ if(5) overlays += "pai-laugh"
+ if(6) overlays += "pai-off"
+ if(7) overlays += "pai-sad"
+ if(8) overlays += "pai-angry"
+ if(9) overlays += "pai-what"
current_emotion = emotion
/obj/item/device/paicard/proc/alertUpdate()
- var/turf/T = get_turf_or_move(src.loc)
+ var/turf/T = get_turf_or_move(loc)
for(var/mob/M in viewers(T))
M.show_message("\blue [src] flashes a message across its screen, \"Additional personalities available for download.\"", 3, "\blue [src] bleeps electronically.", 2)
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index f126910bcbb..ba62169b886 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -2,11 +2,12 @@
icon = 'icons/obj/assemblies.dmi'
name = "tank transfer valve"
icon_state = "valve_1"
+ item_state = "ttv"
desc = "Regulates the transfer of air between two tanks"
- var/obj/item/weapon/tank/tank_one
- var/obj/item/weapon/tank/tank_two
- var/obj/item/device/attached_device
- var/mob/attacher = null
+ var/obj/item/weapon/tank/tank_one = null
+ var/obj/item/weapon/tank/tank_two = null
+ var/obj/item/device/assembly/attached_device = null
+ var/mob/living/attacher = null
var/valve_open = 0
var/toggle = 1
origin_tech = "materials=1;engineering=1"
@@ -21,75 +22,79 @@
if(attached_device)
qdel(attached_device)
attached_device = null
+ attacher = null
return ..()
-/obj/item/device/transfer_valve/proc/process_activation(var/obj/item/device/D)
-
/obj/item/device/transfer_valve/IsAssemblyHolder()
return 1
-/obj/item/device/transfer_valve/attackby(obj/item/item, mob/user, params)
- if(istype(item, /obj/item/weapon/tank))
+/obj/item/device/transfer_valve/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/weapon/tank))
if(tank_one && tank_two)
to_chat(user, "There are already two tanks attached, remove one first.")
return
if(!tank_one)
- tank_one = item
- user.drop_item()
- item.loc = src
+ if(!user.unEquip(I))
+ return
+ tank_one = I
+ I.forceMove(src)
to_chat(user, "You attach the tank to the transfer valve.")
+ if(I.w_class > w_class)
+ w_class = I.w_class
else if(!tank_two)
- tank_two = item
- user.drop_item()
- item.loc = src
+ if(!user.unEquip(I))
+ return
+ tank_two = I
+ I.forceMove(src)
to_chat(user, "You attach the tank to the transfer valve.")
+ if(I.w_class > w_class)
+ w_class = I.w_class
update_icon()
nanomanager.update_uis(src) // update all UIs attached to src
//TODO: Have this take an assemblyholder
- else if(isassembly(item))
- var/obj/item/device/assembly/A = item
+ else if(isassembly(I))
+ var/obj/item/device/assembly/A = I
if(A.secured)
to_chat(user, "The device is secured.")
return
if(attached_device)
to_chat(user, "There is already a device attached to the valve, remove it first.")
return
- user.remove_from_mob(item)
+ user.remove_from_mob(A)
attached_device = A
- A.loc = src
- to_chat(user, "You attach the [item] to the valve controls and secure it.")
+ A.forceMove(src)
+ to_chat(user, "You attach the [A] to the valve controls and secure it.")
A.holder = src
A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
- bombers += "[key_name(user)] attached a [item] to a transfer valve."
- msg_admin_attack("[key_name_admin(user)]attached [item] to a transfer valve.")
- log_game("[key_name_admin(user)] attached [item] to a transfer valve.")
+ bombers += "[key_name(user)] attached a [A] to a transfer valve."
+ msg_admin_attack("[key_name_admin(user)]attached [A] to a transfer valve.")
+ log_game("[key_name_admin(user)] attached [A] to a transfer valve.")
attacher = user
nanomanager.update_uis(src) // update all UIs attached to src
- return
-/obj/item/device/transfer_valve/HasProximity(atom/movable/AM as mob|obj)
- if(!attached_device) return
+/obj/item/device/transfer_valve/HasProximity(atom/movable/AM)
+ if(!attached_device)
+ return
attached_device.HasProximity(AM)
- return
-/obj/item/device/transfer_valve/hear_talk(mob/living/M as mob, msg)
+/obj/item/device/transfer_valve/hear_talk(mob/living/M, msg)
..()
for(var/obj/O in contents)
O.hear_talk(M, msg)
-/obj/item/device/transfer_valve/hear_message(mob/living/M as mob, msg)
+/obj/item/device/transfer_valve/hear_message(mob/living/M, msg)
..()
for(var/obj/O in contents)
O.hear_message(M, msg)
-/obj/item/device/transfer_valve/attack_self(mob/user as mob)
+/obj/item/device/transfer_valve/attack_self(mob/user)
ui_interact(user)
-/obj/item/device/transfer_valve/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+/obj/item/device/transfer_valve/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
// update the ui if it exists, returns null if no ui is passed/found
ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
@@ -113,36 +118,40 @@
/obj/item/device/transfer_valve/Topic(href, href_list)
..()
- if( usr.stat || usr.restrained() )
+ if(usr.incapacitated())
return 0
- if(src.loc != usr)
+ if(loc != usr)
return 0
if(tank_one && href_list["tankone"])
split_gases()
valve_open = 0
- tank_one.loc = get_turf(src)
+ tank_one.forceMove(get_turf(src))
tank_one = null
update_icon()
+ if((!tank_two || tank_two.w_class < 4) && (w_class > 3))
+ w_class = 3
else if(tank_two && href_list["tanktwo"])
split_gases()
valve_open = 0
- tank_two.loc = get_turf(src)
+ tank_two.forceMove(get_turf(src))
tank_two = null
update_icon()
+ if((!tank_one || tank_one.w_class < 4) && (w_class > 3))
+ w_class = 3
else if(href_list["open"])
toggle_valve()
else if(attached_device)
if(href_list["rem_device"])
- attached_device.loc = get_turf(src)
- attached_device:holder = null
+ attached_device.forceMove(get_turf(src))
+ attached_device.holder = null
attached_device = null
update_icon()
if(href_list["device"])
attached_device.attack_self(usr)
- src.add_fingerprint(usr)
+ add_fingerprint(usr)
return 1 // Returning 1 sends an update to attached UIs
-/obj/item/device/transfer_valve/process_activation(var/obj/item/device/D)
+/obj/item/device/transfer_valve/proc/process_activation(obj/item/device/D)
if(toggle)
toggle = 0
toggle_valve()
@@ -188,7 +197,7 @@
*/
/obj/item/device/transfer_valve/proc/toggle_valve()
- if(valve_open==0 && (tank_one && tank_two))
+ if(!valve_open && tank_one && tank_two)
valve_open = 1
var/turf/bombturf = get_turf(src)
var/area/A = get_area(bombturf)
@@ -206,17 +215,12 @@
log_game("Bomb valve opened at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name(mob)]")
merge_gases()
spawn(20) // In case one tank bursts
- for(var/i=0,i<5,i++)
- src.update_icon()
+ for(var/i in 1 to 5)
+ update_icon()
sleep(10)
- src.update_icon()
+ update_icon()
- else if(valve_open==1 && (tank_one && tank_two))
+ else if(valve_open && tank_one && tank_two)
split_gases()
valve_open = 0
- src.update_icon()
-
-// this doesn't do anything but the timer etc. expects it to be here
-// eventually maybe have it update icon to show state (timer, prox etc.) like old bombs
-/obj/item/device/transfer_valve/proc/c_state()
- return
+ update_icon()
\ No newline at end of file
diff --git a/code/game/objects/items/devices/violin.dm b/code/game/objects/items/devices/violin.dm
index 323fb3db4f4..3ad1e98d6a6 100644
--- a/code/game/objects/items/devices/violin.dm
+++ b/code/game/objects/items/devices/violin.dm
@@ -30,10 +30,7 @@
ui_interact(user)
/obj/item/device/violin/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
- if(!user)
- return
-
- if(!isliving(user) || user.stat || user.restrained() || user.lying)
+ if(!isliving(user) || user.incapacitated())
return
song.ui_interact(user, ui_key, ui, force_open)
diff --git a/code/game/objects/items/robot/ai_upgrades.dm b/code/game/objects/items/robot/ai_upgrades.dm
index a27cfe68476..589e1ba87e0 100644
--- a/code/game/objects/items/robot/ai_upgrades.dm
+++ b/code/game/objects/items/robot/ai_upgrades.dm
@@ -5,7 +5,7 @@
/obj/item/device/malf_upgrade
name = "combat software upgrade"
desc = "A highly illegal, highly dangerous upgrade for artificial intelligence units, granting them a variety of powers as well as the ability to hack APCs."
- icon = 'icons/obj/cloning.dmi'
+ icon = 'icons/obj/module.dmi'
icon_state = "datadisk3"
@@ -26,7 +26,7 @@
/obj/item/device/surveillance_upgrade
name = "surveillance software upgrade"
desc = "A software package that will allow an artificial intelligence to 'hear' from its cameras via lip reading."
- icon = 'icons/obj/cloning.dmi'
+ icon = 'icons/obj/module.dmi'
icon_state = "datadisk3"
/obj/item/device/surveillance_upgrade/afterattack(mob/living/silicon/ai/AI, mob/user)
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index bd6f3acfdee..40cc65da34a 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -196,25 +196,6 @@
return 1
-/obj/item/borg/upgrade/hyperka
- name = "mining cyborg hyper-kinetic accelerator"
- desc = "A satchel of holding replacement for mining cyborg's ore satchel module."
- icon_state = "cyborg_upgrade3"
- require_module = 1
- module_type = /obj/item/weapon/robot_module/miner
-
-/obj/item/borg/upgrade/hyperka/action(mob/living/silicon/robot/R)
- if(..())
- return
-
- for(var/obj/item/weapon/gun/energy/kinetic_accelerator/cyborg/H in R.module.modules)
- qdel(H)
-
- R.module.modules += new /obj/item/weapon/gun/energy/kinetic_accelerator/hyper/cyborg(R.module)
- R.module.rebuild()
-
- return 1
-
/obj/item/borg/upgrade/syndicate
name = "illegal equipment module"
desc = "Unlocks the hidden, deadlier functions of a cyborg"
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 2c6d04b9c06..1555e9a697f 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -152,8 +152,6 @@
icon_state = "burnkit"
heal_burn = 25
-
-
//Medical Herbs//
@@ -161,8 +159,8 @@
name = "\improper Comfrey leaf"
singular_name = "Comfrey leaf"
desc = "A soft leaf that is rubbed on bruises."
- icon = 'icons/obj/hydroponics_products.dmi'
- icon_state = "alien3-product"
+ icon = 'icons/obj/hydroponics/harvest.dmi'
+ icon_state = "tea_aspera_leaves"
color = "#378C61"
heal_brute = 12
@@ -171,13 +169,12 @@
name = "\improper Aloe Vera leaf"
singular_name = "Aloe Vera leaf"
desc = "A cold leaf that is rubbed on burns."
- icon = 'icons/obj/hydroponics_products.dmi'
- icon_state = "ambrosia-product"
+ icon = 'icons/obj/hydroponics/harvest.dmi'
+ icon_state = "ambrosiavulgaris"
color = "#4CC5C7"
heal_burn = 12
-
//Splits//
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 4678d18a2f3..46f7b3fb469 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -102,19 +102,49 @@ var/global/list/datum/stack_recipe/human_recipes = list( \
icon_state = "sheet-leather"
origin_tech = "materials=2"
+/obj/item/stack/sheet/sinew
+ name = "watcher sinew"
+ icon = 'icons/obj/mining.dmi'
+ desc = "Long stringy filaments which presumably came from a watcher's wings."
+ singular_name = "watcher sinew"
+ icon_state = "sinew"
+ origin_tech = "biotech=4"
+
+var/global/list/datum/stack_recipe/sinew_recipes = list ( \
+ new/datum/stack_recipe("sinew restraints", /obj/item/weapon/restraints/handcuffs/sinew, 1, on_floor = 1), \
+ )
+/obj/item/stack/sheet/sinew/New(var/loc, var/amount=null)
+ recipes = sinew_recipes
+ return ..()
+
+/obj/item/stack/sheet/animalhide/goliath_hide
+ name = "goliath hide plates"
+ desc = "Pieces of a goliath's rocky hide, these might be able to make your suit a bit more durable to attack from the local fauna."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "goliath_hide"
+ singular_name = "hide plate"
+ flags = NOBLUDGEON
+ w_class = 3
+ layer = MOB_LAYER
+/obj/item/stack/sheet/animalhide/ashdrake
+ name = "ash drake hide"
+ desc = "The strong, scaled hide of an ash drake."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "dragon_hide"
+ singular_name = "drake plate"
+ flags = NOBLUDGEON
+ w_class = 3
+ layer = MOB_LAYER
+
//Step one - dehairing.
/obj/item/stack/sheet/animalhide/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
- if( istype(W, /obj/item/weapon/kitchen/knife) || \
- istype(W, /obj/item/weapon/twohanded/fireaxe) || \
- istype(W, /obj/item/weapon/hatchet) )
-
- //visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message)
- usr.visible_message("\blue \the [usr] starts cutting hair off \the [src]", "\blue You start cutting the hair off \the [src]", "You hear the sound of a knife rubbing against flesh")
+ if(W.sharp)
+ user.visible_message("[user] starts cutting hair off \the [src].", "You start cutting the hair off \the [src]...", "You hear the sound of a knife rubbing against flesh.")
if(do_after(user,50, target = src))
- to_chat(usr, "\blue You cut the hair from this [src.singular_name]")
+ to_chat(user, "You cut the hair from this [src.singular_name].")
//Try locating an exisitng stack on the tile and add to there if possible
for(var/obj/item/stack/sheet/hairlesshide/HS in usr.loc)
if(HS.amount < 50)
@@ -128,7 +158,6 @@ var/global/list/datum/stack_recipe/human_recipes = list( \
else
..()
-
//Step two - washing..... it's actually in washing machine code.
//Step three - drying
diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm
index 4d8b27a6690..9ca562b50ce 100644
--- a/code/game/objects/items/stacks/sheets/light.dm
+++ b/code/game/objects/items/stacks/sheets/light.dm
@@ -3,6 +3,7 @@
gender = PLURAL
singular_name = "wired glass floor tile"
desc = "A glass tile, which is wired, somehow."
+ icon = 'icons/obj/tiles.dmi'
icon_state = "glass_wire"
w_class = 3
force = 3.0
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 3afb9b21eab..7612d3a88ad 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -12,35 +12,43 @@ Mineral Sheets
- Tranqillite
- Enriched Uranium
- Platinum
- - Metallic Hydrogen
- - Tritium
- - Osmium
*/
var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
- new/datum/stack_recipe("pile of dirt", /obj/machinery/portable_atmospherics/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \
)
var/global/list/datum/stack_recipe/silver_recipes = list ( \
new/datum/stack_recipe("silver door", /obj/structure/mineral_door/silver, 10, one_per_turf = 1, on_floor = 1), \
+ null, \
+ new/datum/stack_recipe("silver tile", /obj/item/stack/tile/mineral/silver, 1, 4, 20), \
)
var/global/list/datum/stack_recipe/diamond_recipes = list ( \
new/datum/stack_recipe("diamond door", /obj/structure/mineral_door/transparent/diamond, 10, one_per_turf = 1, on_floor = 1), \
+ null, \
+ new/datum/stack_recipe("diamond tile", /obj/item/stack/tile/mineral/diamond, 1, 4, 20), \
)
var/global/list/datum/stack_recipe/uranium_recipes = list ( \
new/datum/stack_recipe("uranium door", /obj/structure/mineral_door/uranium, 10, one_per_turf = 1, on_floor = 1), \
+ null, \
+ new/datum/stack_recipe("uranium tile", /obj/item/stack/tile/mineral/uranium, 1, 4, 20), \
)
var/global/list/datum/stack_recipe/gold_recipes = list ( \
new/datum/stack_recipe("golden door", /obj/structure/mineral_door/gold, 10, one_per_turf = 1, on_floor = 1), \
+ null, \
+ new/datum/stack_recipe("gold tile", /obj/item/stack/tile/mineral/gold, 1, 4, 20), \
+ null, \
new/datum/stack_recipe("Simple Crown", /obj/item/clothing/head/crown, 5), \
)
var/global/list/datum/stack_recipe/plasma_recipes = list ( \
new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \
+ null, \
+ new/datum/stack_recipe("plasma tile", /obj/item/stack/tile/mineral/plasma, 1, 4, 20), \
)
var/global/list/datum/stack_recipe/plastic_recipes = list ( \
@@ -61,13 +69,24 @@ var/global/list/datum/stack_recipe/plastic_recipes = list ( \
)
var/global/list/datum/stack_recipe/bananium_recipes = list ( \
+ new/datum/stack_recipe("bananium tile", /obj/item/stack/tile/mineral/bananium, 1, 4, 20), \
+ null, \
new/datum/stack_recipe("bananium computer frame", /obj/structure/computerframe/HONKputer, 50, time = 25, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("bananium grenade casing", /obj/item/weapon/grenade/bananade/casing, 4, on_floor = 1), \
)
var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
- new/datum/stack_recipe("silent tile", /obj/item/stack/tile/silent, 1, 4, 20), \
new/datum/stack_recipe("invisible wall", /obj/structure/barricade/mime, 5, one_per_turf = 1, on_floor = 1, time = 50), \
+ null, \
+ new/datum/stack_recipe("silent tile", /obj/item/stack/tile/mineral/tranquillite, 1, 4, 20), \
+ )
+
+var/global/list/datum/stack_recipe/abductor_recipes = list ( \
+ new/datum/stack_recipe("alien bed", /obj/structure/stool/bed/abductor, 2, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("alien locker", /obj/structure/closet/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("alien table frame", /obj/structure/abductor_tableframe, 1, time = 15, one_per_turf = 1, on_floor = 1), \
+ null, \
+ new/datum/stack_recipe("alien floor tile", /obj/item/stack/tile/mineral/abductor, 1, 4, 20), \
)
/obj/item/stack/sheet/mineral
@@ -100,11 +119,11 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
/obj/item/stack/sheet/mineral/diamond
name = "diamond"
icon_state = "sheet-diamond"
+ singular_name = "diamond"
origin_tech = "materials=6"
sheettype = "diamond"
materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT)
-
/obj/item/stack/sheet/mineral/diamond/New()
..()
recipes = diamond_recipes
@@ -112,6 +131,7 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
/obj/item/stack/sheet/mineral/uranium
name = "uranium"
icon_state = "sheet-uranium"
+ singular_name = "uranium sheet"
origin_tech = "materials=5"
sheettype = "uranium"
materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT)
@@ -123,6 +143,7 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
/obj/item/stack/sheet/mineral/plasma
name = "solid plasma"
icon_state = "sheet-plasma"
+ singular_name = "plasma sheet"
origin_tech = "plasmatech=2;materials=2"
sheettype = "plasma"
materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)
@@ -161,6 +182,7 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
/obj/item/stack/sheet/mineral/gold
name = "gold"
icon_state = "sheet-gold"
+ singular_name = "gold bar"
origin_tech = "materials=4"
sheettype = "gold"
materials = list(MAT_GOLD=MINERAL_MATERIAL_AMOUNT)
@@ -172,6 +194,7 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
/obj/item/stack/sheet/mineral/silver
name = "silver"
icon_state = "sheet-silver"
+ singular_name = "silver bar"
origin_tech = "materials=3"
sheettype = "silver"
materials = list(MAT_SILVER=MINERAL_MATERIAL_AMOUNT)
@@ -183,23 +206,24 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
/obj/item/stack/sheet/mineral/bananium
name = "bananium"
icon_state = "sheet-clown"
+ singular_name = "bananium sheet"
origin_tech = "materials=4"
sheettype = "bananium"
materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
-/obj/item/stack/sheet/mineral/bananium/New(var/loc, var/amount=null)
+/obj/item/stack/sheet/mineral/bananium/New(loc, amount=null)
..()
recipes = bananium_recipes
/obj/item/stack/sheet/mineral/tranquillite
name = "tranquillite"
- singular_name = "beret"
icon_state = "sheet-mime"
+ singular_name = "beret"
origin_tech = "materials=4"
sheettype = "tranquillite"
materials = list(MAT_TRANQUILLITE=MINERAL_MATERIAL_AMOUNT)
-/obj/item/stack/sheet/mineral/tranquillite/New(var/loc, var/amount=null)
+/obj/item/stack/sheet/mineral/tranquillite/New(loc, amount=null)
..()
recipes = tranquillite_recipes
@@ -209,9 +233,7 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
origin_tech = "materials=6"
materials = list(MAT_URANIUM=3000)
-/*
- * Alien Alloy
- */
+//Alien Alloy
/obj/item/stack/sheet/mineral/abductor
name = "alien alloy"
icon = 'icons/obj/abductor.dmi'
@@ -225,14 +247,6 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
origin_tech = "materials=6;abductor=1"
sheettype = "abductor"
-var/global/list/datum/stack_recipe/abductor_recipes = list ( \
- new/datum/stack_recipe("alien bed", /obj/structure/stool/bed/abductor, 2, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("alien locker", /obj/structure/closet/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("alien table frame", /obj/structure/abductor_tableframe, 1, time = 15, one_per_turf = 1, on_floor = 1), \
- null, \
- new/datum/stack_recipe("alien floor tile", /obj/item/stack/tile/mineral/abductor, 1, 4, 20), \
- )
-
-/obj/item/stack/sheet/mineral/abductor/New(var/loc, var/amount=null)
+/obj/item/stack/sheet/mineral/abductor/New(loc, amount=null)
recipes = abductor_recipes
..()
\ No newline at end of file
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 509d6adb0a7..4e822d3ce12 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -53,6 +53,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
new /datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("machine frame", /obj/machinery/constructable_frame/machine_frame, 5, time = 25, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 25, one_per_turf = 1, on_floor = 1),
+ new /datum/stack_recipe("firelock frame", /obj/structure/firelock_frame, 3, time = 50, one_per_turf = 1, on_floor = 1), \
new /datum/stack_recipe("meatspike frame", /obj/structure/kitchenspike_frame, 5, time = 25, one_per_turf = 1, on_floor = 1),
null,
new /datum/stack_recipe_list("airlock assemblies", list(
@@ -63,7 +64,6 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
new /datum/stack_recipe("mining airlock assembly", /obj/structure/door_assembly/door_assembly_min, 4, time = 50, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("atmospherics airlock assembly", /obj/structure/door_assembly/door_assembly_atmo, 4, time = 50, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("research airlock assembly", /obj/structure/door_assembly/door_assembly_research, 4, time = 50, one_per_turf = 1, on_floor = 1),
-/* new /datum/stack_recipe("science airlock assembly", /obj/structure/door_assembly/door_assembly_science, 4, time = 50, one_per_turf = 1, on_floor = 1), */
new /datum/stack_recipe("medical airlock assembly", /obj/structure/door_assembly/door_assembly_med, 4, time = 50, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_mai, 4, time = 50, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("external airlock assembly", /obj/structure/door_assembly/door_assembly_ext, 4, time = 50, one_per_turf = 1, on_floor = 1),
@@ -145,6 +145,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
new /datum/stack_recipe("wooden chair", /obj/structure/stool/bed/chair/wood/normal, 3, time = 10, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("bookcase", /obj/structure/bookcase, 5, time = 50, one_per_turf = 1, on_floor = 1),
+ new /datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying_rack, 10, time = 15, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40),
new /datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1),
@@ -170,13 +171,42 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
/*
* Cloth
*/
+var/global/list/datum/stack_recipe/cloth_recipes = list ( \
+ new/datum/stack_recipe("grey jumpsuit", /obj/item/clothing/under/color/grey, 3), \
+ new/datum/stack_recipe("black shoes", /obj/item/clothing/shoes/black, 2), \
+ null, \
+ new/datum/stack_recipe("backpack", /obj/item/weapon/storage/backpack, 4), \
+ new/datum/stack_recipe("dufflebag", /obj/item/weapon/storage/backpack/duffel, 6), \
+ null, \
+ new/datum/stack_recipe("plant bag", /obj/item/weapon/storage/bag/plants, 4), \
+ new/datum/stack_recipe("book bag", /obj/item/weapon/storage/bag/books, 4), \
+ new/datum/stack_recipe("mining satchel", /obj/item/weapon/storage/bag/ore, 4), \
+ new/datum/stack_recipe("chemistry bag", /obj/item/weapon/storage/bag/chemistry, 4), \
+ new/datum/stack_recipe("bio bag", /obj/item/weapon/storage/bag/bio, 4), \
+ null, \
+ new/datum/stack_recipe("rag", /obj/item/weapon/reagent_containers/glass/rag, 1), \
+ new/datum/stack_recipe("bedsheet", /obj/item/weapon/bedsheet, 3), \
+ null, \
+ new/datum/stack_recipe("fingerless gloves", /obj/item/clothing/gloves/fingerless, 1), \
+ new/datum/stack_recipe("black gloves", /obj/item/clothing/gloves/color/black, 3), \
+ )
+
/obj/item/stack/sheet/cloth
name = "cloth"
- desc = "This roll of cloth is made from only the finest chemicals and bunny rabbits."
+ desc = "Is it cotton? Linen? Denim? Burlap? Canvas? You can't tell."
singular_name = "cloth roll"
icon_state = "sheet-cloth"
origin_tech = "materials=2"
burn_state = FLAMMABLE
+ force = 0
+ throwforce = 0
+
+/obj/item/stack/sheet/cloth/New(loc, amount=null)
+ recipes = cloth_recipes
+ ..()
+
+/obj/item/stack/sheet/cloth/ten
+ amount = 10
/*
* Cardboard
@@ -240,3 +270,19 @@ var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \
/obj/item/stack/sheet/runed_metal/New(var/loc, var/amount=null)
recipes = runed_metal_recipes
return ..()
+
+/*
+ * Bones
+ */
+/obj/item/stack/sheet/bone
+ name = "bones"
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "bone"
+ singular_name = "bone"
+ desc = "Someone's been drinking their milk."
+ force = 7
+ throwforce = 5
+ w_class = 3
+ throw_speed = 1
+ throw_range = 3
+ origin_tech = "materials=2;biotech=2"
\ No newline at end of file
diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm
index 7e6d5459dbf..7f9c6b6535b 100644
--- a/code/game/objects/items/stacks/tiles/tile_mineral.dm
+++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm
@@ -1,3 +1,68 @@
+/obj/item/stack/tile/mineral/plasma
+ name = "plasma tile"
+ singular_name = "plasma floor tile"
+ desc = "A tile made out of highly flammable plasma. This can only end well."
+ icon_state = "tile_plasma"
+ origin_tech = "plasmatech=1"
+ turf_type = /turf/simulated/floor/mineral/plasma
+ mineralType = "plasma"
+ materials = list(MAT_PLASMA=500)
+
+/obj/item/stack/tile/mineral/uranium
+ name = "uranium tile"
+ singular_name = "uranium floor tile"
+ desc = "A tile made out of uranium. You feel a bit woozy."
+ icon_state = "tile_uranium"
+ turf_type = /turf/simulated/floor/mineral/uranium
+ mineralType = "uranium"
+ materials = list(MAT_URANIUM=500)
+
+/obj/item/stack/tile/mineral/gold
+ name = "gold tile"
+ singular_name = "gold floor tile"
+ desc = "A tile made out of gold, the swag seems strong here."
+ icon_state = "tile_gold"
+ turf_type = /turf/simulated/floor/mineral/gold
+ mineralType = "gold"
+ materials = list(MAT_GOLD=500)
+
+/obj/item/stack/tile/mineral/silver
+ name = "silver tile"
+ singular_name = "silver floor tile"
+ desc = "A tile made out of silver, the light shining from it is blinding."
+ icon_state = "tile_silver"
+ turf_type = /turf/simulated/floor/mineral/silver
+ mineralType = "silver"
+ materials = list(MAT_SILVER=500)
+
+/obj/item/stack/tile/mineral/diamond
+ name = "diamond tile"
+ singular_name = "diamond floor tile"
+ desc = "A tile made out of diamond. Wow, just, wow."
+ icon_state = "tile_diamond"
+ origin_tech = "materials=2"
+ turf_type = /turf/simulated/floor/mineral/diamond
+ mineralType = "diamond"
+ materials = list(MAT_DIAMOND=500)
+
+/obj/item/stack/tile/mineral/bananium
+ name = "bananium tile"
+ singular_name = "bananium floor tile"
+ desc = "A tile made out of bananium, HOOOOOOOOONK!"
+ icon_state = "tile_bananium"
+ turf_type = /turf/simulated/floor/mineral/bananium
+ mineralType = "bananium"
+ materials = list(MAT_BANANIUM=500)
+
+/obj/item/stack/tile/mineral/tranquillite
+ name = "silent tile"
+ singular_name = "silent floor tile"
+ desc = "A tile made out of tranquillite, SHHHHHHHHH!"
+ icon_state = "tile_tranquillite"
+ turf_type = /turf/simulated/floor/mineral/tranquillite
+ mineralType = "tranquillite"
+ materials = list(MAT_TRANQUILLITE=500)
+
/obj/item/stack/tile/mineral/abductor
name = "alien floor tile"
singular_name = "alien floor tile"
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index f5b3650c5bb..afa38da7721 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -1,19 +1,8 @@
-/* Different misc types of tiles
- * Contains:
- * Grass
- * Wood
- * Carpet
- * Plasteel
- * Light
- * Fakespace
- * High-traction
- \\ If you don't update the contains list, I'm going to shank you
- */
/obj/item/stack/tile
name = "broken tile"
singular_name = "broken tile"
desc = "A broken tile. This should not exist."
- icon = 'icons/obj/items.dmi'
+ icon = 'icons/obj/tiles.dmi'
icon_state = "tile"
item_state = "tile"
w_class = 3
@@ -23,12 +12,64 @@
throw_range = 20
max_amount = 60
flags = CONDUCT
+ origin_tech = "materials=1"
var/turf_type = null
var/mineralType = null
-/*
- * Grass
- */
+/obj/item/stack/tile/New(loc, amount)
+ ..()
+ pixel_x = rand(-3, 3)
+ pixel_y = rand(-3, 3) //randomize a little
+
+/obj/item/stack/tile/attackby(obj/item/W, mob/user, params)
+ if(iswelder(W))
+ var/obj/item/weapon/weldingtool/WT = W
+
+ if(is_hot(W) && !mineralType)
+ to_chat(user, "You can not reform this!")
+ return
+
+ if(get_amount() < 4)
+ to_chat(user, "You need at least four tiles to do this!")
+ return
+
+ if(WT.remove_fuel(0,user))
+
+ if(mineralType == "plasma")
+ atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 5)
+ user.visible_message("[user.name] sets the plasma tiles on fire!", \
+ "You set the plasma tiles on fire!")
+ qdel(src)
+ return
+
+ if (mineralType == "metal")
+ var/obj/item/stack/sheet/metal/new_item = new(user.loc)
+ user.visible_message("[user.name] shaped [src] into metal with the welding tool.", \
+ "You shaped [src] into metal with the welding tool.", \
+ "You hear welding.")
+ var/obj/item/stack/rods/R = src
+ src = null
+ var/replace = (user.get_inactive_hand()==R)
+ R.use(4)
+ if(!R && replace)
+ user.put_in_hands(new_item)
+
+ else
+ var/sheet_type = text2path("/obj/item/stack/sheet/mineral/[mineralType]")
+ var/obj/item/stack/sheet/mineral/new_item = new sheet_type(user.loc)
+ user.visible_message("[user.name] shaped [src] into a sheet with the welding tool.", \
+ "You shaped [src] into a sheet with the welding tool.", \
+ "You hear welding.")
+ var/obj/item/stack/rods/R = src
+ src = null
+ var/replace = (user.get_inactive_hand()==R)
+ R.use(4)
+ if (!R && replace)
+ user.put_in_hands(new_item)
+ else
+ return ..()
+
+//Grass
/obj/item/stack/tile/grass
name = "grass tiles"
gender = PLURAL
@@ -39,21 +80,18 @@
turf_type = /turf/simulated/floor/grass
burn_state = FLAMMABLE
-/*
- * Wood
- */
+//Wood
/obj/item/stack/tile/wood
name = "wood floor tiles"
gender = PLURAL
singular_name = "wood floor tile"
desc = "an easy to fit wood floor tile"
icon_state = "tile-wood"
+ origin_tech = "biotech=1"
turf_type = /turf/simulated/floor/wood
burn_state = FLAMMABLE
-/*
- * Carpets
- */
+//Carpets
/obj/item/stack/tile/carpet
name = "carpet"
singular_name = "carpet"
@@ -62,9 +100,7 @@
turf_type = /turf/simulated/floor/carpet
burn_state = FLAMMABLE
-/*
- * Plasteel
- */
+//Plasteel
/obj/item/stack/tile/plasteel
name = "floor tiles"
gender = PLURAL
@@ -80,9 +116,7 @@
turf_type = /turf/simulated/floor/plasteel
mineralType = "metal"
-/*
- * Light
- */
+//Light
/obj/item/stack/tile/light
name = "light tiles"
gender = PLURAL
@@ -94,9 +128,7 @@
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
turf_type = /turf/simulated/floor/light
-/*
- * Fakespace
- */
+//Fakespace
/obj/item/stack/tile/fakespace
name = "astral carpet"
singular_name = "astral carpet"
@@ -120,16 +152,6 @@
/obj/item/stack/tile/noslip/loaded
amount = 20
-/obj/item/stack/tile/silent
- name = "silent tile"
- singular_name = "silent floor tile"
- desc = "A tile made out of tranquillite, SHHHHHHHHH!"
- icon_state = "tile-silent"
- origin_tech = "materials=1"
- turf_type = /turf/simulated/floor/silent
- mineralType = "tranquillite"
- materials = list(MAT_TRANQUILLITE=500)
-
//Pod floor
/obj/item/stack/tile/pod
name = "pod floor tile"
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 69f03730ce2..feb681e47c2 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -43,14 +43,20 @@
/obj/item/toy/balloon/attack(mob/living/carbon/human/M as mob, mob/user as mob)
return
-/obj/item/toy/balloon/afterattack(atom/A as mob|obj, mob/user as mob, proximity)
- if(!proximity) return
- if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1)
- A.reagents.trans_to(src, 10)
- to_chat(user, "You fill the balloon with the contents of [A].")
- desc = "A translucent balloon with some form of liquid sloshing around in it."
- update_icon()
- return
+/obj/item/toy/balloon/afterattack(atom/A, mob/user, proximity)
+ if(!proximity)
+ return
+ if(istype(A, /obj/structure/reagent_dispensers))
+ var/obj/structure/reagent_dispensers/RD = A
+ if(RD.reagents.total_volume <= 0)
+ to_chat(user, "[RD] is empty.")
+ else if(reagents.total_volume >= 10)
+ to_chat(user, "[src] is full.")
+ else
+ A.reagents.trans_to(src, 10)
+ to_chat(user, "You fill the balloon with the contents of [A].")
+ desc = "A translucent balloon with some form of liquid sloshing around in it."
+ update_icon()
/obj/item/toy/balloon/wash(mob/user, atom/source)
if(reagents.total_volume < 10)
@@ -877,7 +883,7 @@ obj/item/toy/cards/deck/syndicate/black
/obj/item/toy/minimeteor
name = "Mini-Meteor"
- desc = "Relive the excitement of a meteor shower! SweetMeat-eor. Co is not responsible for any injuries, headaches or hearing loss caused by Mini-Meteor™"
+ desc = "Relive the excitement of a meteor shower! SweetMeat-eor. Co is not responsible for any injuries, headaches or hearing loss caused by Mini-Meteor."
icon = 'icons/obj/toy.dmi'
icon_state = "minimeteor"
w_class = 2
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index 0bacbaa161e..67f15bb3fe1 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -7,7 +7,7 @@ RCD
/obj/item/weapon/rcd
name = "rapid-construction-device (RCD)"
desc = "A device used to rapidly build and deconstruct walls and floors."
- icon = 'icons/obj/items.dmi'
+ icon = 'icons/obj/tools.dmi'
icon_state = "rcd"
opacity = 0
density = 0
diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm
index 7cbe5783a9a..47cf88f9bbc 100644
--- a/code/game/objects/items/weapons/RSF.dm
+++ b/code/game/objects/items/weapons/RSF.dm
@@ -6,8 +6,8 @@ RSF
/obj/item/weapon/rsf
name = "\improper Rapid-Service-Fabricator"
desc = "A device used to rapidly deploy service items."
- icon = 'icons/obj/items.dmi'
- icon_state = "rcd"
+ icon = 'icons/obj/tools.dmi'
+ icon_state = "rsf"
opacity = 0
density = 0
anchored = 0.0
diff --git a/code/game/objects/items/weapons/bee_briefcase.dm b/code/game/objects/items/weapons/bee_briefcase.dm
index 8a15bc7f517..7d2b718da82 100644
--- a/code/game/objects/items/weapons/bee_briefcase.dm
+++ b/code/game/objects/items/weapons/bee_briefcase.dm
@@ -46,13 +46,10 @@
to_chat(user, "The buzzing inside the briefcase swells momentarily, then returns to normal. Guess it was too cramped...")
S.reagents.clear_reagents()
S.update_icon()
- else if(istype(I, /obj/item/weapon/plantspray))
- var/obj/item/weapon/plantspray/PS = I
- user.drop_item(PS)
- bees_left = max(0, (bees_left - PS.pest_kill_str))
- to_chat(user, "You spray [PS] into \the [src].")
+ else if(istype(I, /obj/item/weapon/reagent_containers/spray/pestspray))
+ bees_left = max(0, (bees_left - 6))
+ to_chat(user, "You spray [I] into [src].")
playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
- qdel(PS)
/obj/item/weapon/bee_briefcase/attack_self(mob/user as mob)
if(!bees_left)
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index d1721c5c247..4a600fe188f 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -397,6 +397,7 @@
"medical",
"HoS",
"research",
+ "cargo",
"engineering",
"CMO",
"RD",
@@ -757,7 +758,7 @@
override_name = 1
/proc/get_station_card_skins()
- return list("data","id","gold","silver","security","medical","research","engineering","HoS","CMO","RD","CE","clown","mime","rainbow","prisoner")
+ return list("data","id","gold","silver","security","medical","research","cargo","engineering","HoS","CMO","RD","CE","clown","mime","rainbow","prisoner")
/proc/get_centcom_card_skins()
return list("centcom","centcom_old","nanotrasen","ERT_leader","ERT_empty","ERT_security","ERT_engineering","ERT_medical","ERT_janitorial","deathsquad","commander","syndie","TDred","TDgreen")
@@ -769,6 +770,8 @@
switch(skin)
if("id")
return "Standard"
+ if("cargo")
+ return "Supply"
if("HoS")
return "Head of Security"
if("CMO")
diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm
index 26bb243f0d1..f0c4f1e60d6 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -207,9 +207,9 @@ LIGHTERS ARE IN LIGHTERS.DM
var/random_reagent = pick("fuel","saltpetre","synaptizine","green_vomit","potass_iodide","msg","lexorin","mannitol","spaceacillin","cryoxadone","holywater","tea","egg","haloperidol","mutagen","omnizine","carpet","aranesp","cryostylane","chocolate","bilk","cheese","rum","blood","charcoal","coffee","ectoplasm","space_drugs","milk","mutadone","antihol","teporone","insulin","salbutamol","toxin")
reagents.add_reagent(random_reagent, 10)
-/obj/item/clothing/mask/cigarette/joint
- name = "joint"
- desc = "A roll of ambrosium vulgaris wrapped in a thin paper. Dude."
+/obj/item/clothing/mask/cigarette/rollie
+ name = "rollie"
+ desc = "A roll of dried plant matter wrapped in thin paper."
icon_state = "spliffoff"
icon_on = "spliffon"
icon_off = "spliffoff"
@@ -219,35 +219,21 @@ LIGHTERS ARE IN LIGHTERS.DM
smoketime = 180
chem_volume = 50
-/obj/item/clothing/mask/cigarette/joint/New()
+/obj/item/clothing/mask/cigarette/rollie/New()
..()
- var/list/jointnames = list("joint","doobie","spliff","blunt")
- name = pick(jointnames)
- src.pixel_x = rand(-5.0, 5)
- src.pixel_y = rand(-5.0, 5)
+ pixel_x = rand(-5, 5)
+ pixel_y = rand(-5, 5)
-/obj/item/clothing/mask/cigarette/joint/deus
- desc = "A roll of ambrosium deus wrapped in a thin paper. Dude."
/obj/item/weapon/cigbutt/roach
name = "roach"
- desc = "A manky old roach."
+ desc = "A manky old roach, or for non-stoners, a used rollup."
icon_state = "roach"
/obj/item/weapon/cigbutt/roach/New()
..()
- src.pixel_x = rand(-5.0, 5)
- src.pixel_y = rand(-5.0, 5)
-
-/obj/item/clothing/mask/cigarette/handroll
- name = "hand-rolled cigarette"
- desc = "A roll of tobacco and nicotine, freshly rolled by hand."
- icon_state = "hr_cigoff"
- item_state = "hr_cigoff"
- icon_on = "hr_cigon" //Note - these are in masks.dmi not in cigarette.dmi
- icon_off = "hr_cigoff"
- type_butt = /obj/item/weapon/cigbutt
- chem_volume = 50
+ pixel_x = rand(-5, 5)
+ pixel_y = rand(-5, 5)
////////////
// CIGARS //
@@ -388,51 +374,30 @@ LIGHTERS ARE IN LIGHTERS.DM
///////////
//ROLLING//
///////////
-obj/item/weapon/rollingpaper
+/obj/item/weapon/rollingpaper
name = "rolling paper"
desc = "A thin piece of paper used to make fine smokeables."
icon = 'icons/obj/cigarettes.dmi'
icon_state = "cig_paper"
w_class = 1
-
-obj/item/weapon/rollingpaperpack
- name = "rolling paper pack"
- desc = "A pack of Nanotrasen brand rolling papers."
- icon = 'icons/obj/cigarettes.dmi'
- icon_state = "cig_paper_pack"
- w_class = 1
- var/papers = 25
-
-obj/item/weapon/rollingpaperpack/attack_self(mob/user)
- if(papers > 1)
- var/obj/item/weapon/rollingpaper/P = new /obj/item/weapon/rollingpaper()
- user.put_in_inactive_hand(P)
- to_chat(user, "You take a paper out of the pack.")
- papers --
- else
- var/obj/item/weapon/rollingpaper/P = new /obj/item/weapon/rollingpaper()
- user.put_in_inactive_hand(P)
- to_chat(user, "You take the last paper out of the pack, and throw the pack away.")
- qdel(src)
-
-/obj/item/weapon/rollingpaperpack/MouseDrop(atom/over_object)
- var/mob/M = usr
- if(M.restrained() || M.stat)
+/obj/item/weapon/rollingpaper/afterattack(atom/target, mob/user, proximity)
+ if(!proximity)
return
-
- if(over_object == M)
- M.put_in_hands(src)
-
- else if(istype(over_object, /obj/screen))
- switch(over_object.name)
- if("r_hand")
- M.unEquip(src)
- M.put_in_r_hand(src)
- if("l_hand")
- M.unEquip(src)
- M.put_in_l_hand(src)
-
-/obj/item/weapon/rollingpaperpack/examine(mob/user)
- ..(user)
- to_chat(user, "There are [src.papers] left")
+ if(istype(target, /obj/item/weapon/reagent_containers/food/snacks/grown))
+ var/obj/item/weapon/reagent_containers/food/snacks/grown/O = target
+ if(O.dry)
+ user.unEquip(target, 1)
+ user.unEquip(src, 1)
+ var/obj/item/clothing/mask/cigarette/rollie/R = new /obj/item/clothing/mask/cigarette/rollie(user.loc)
+ R.chem_volume = target.reagents.total_volume
+ target.reagents.trans_to(R, R.chem_volume)
+ user.put_in_active_hand(R)
+ to_chat(user, "You roll the [target.name] into a rolling paper.")
+ R.desc = "Dried [target.name] rolled up in a thin piece of paper."
+ qdel(target)
+ qdel(src)
+ else
+ to_chat(user, "You need to dry this first!")
+ else
+ ..()
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index aea1ebd3e1b..db6035bddbe 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -5,26 +5,6 @@
* Bike Horns
*/
-/*
- * Banana Peals
- */
-
-/obj/item/weapon/bananapeel
- name = "banana peel"
- desc = "A peel from a banana."
- icon = 'icons/obj/items.dmi'
- icon_state = "banana_peel"
- item_state = "banana_peel"
- w_class = 1
- throwforce = 0
- throw_speed = 4
- throw_range = 20
-
-/obj/item/weapon/bananapeel/Crossed(AM as mob|obj)
- if(istype(AM, /mob/living/carbon))
- var/mob/living/carbon/M = AM
- M.slip("banana peel", 4, 2)
-
/*
* Soap
*/
diff --git a/code/game/objects/items/weapons/disks.dm b/code/game/objects/items/weapons/disks.dm
index 1458dab9945..2c3f71f5cf3 100644
--- a/code/game/objects/items/weapons/disks.dm
+++ b/code/game/objects/items/weapons/disks.dm
@@ -1,3 +1,5 @@
/obj/item/weapon/disk
- name = "disk"
- icon = 'icons/obj/items.dmi'
+ icon = 'icons/obj/module.dmi'
+ w_class = 1
+ item_state = "card-id"
+ icon_state = "datadisk0"
diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
index d503ca04a8f..4f9830890d4 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -71,7 +71,7 @@
/obj/item/weapon/pen/invisible,
/obj/item/weapon/lipstick/random,
/obj/item/weapon/grenade/smokebomb,
- /obj/item/weapon/corncob,
+ /obj/item/weapon/grown/corncob,
/obj/item/weapon/contraband/poster,
/obj/item/weapon/bikehorn,
/obj/item/weapon/beach_ball,
@@ -85,8 +85,8 @@
/obj/random/mech,
/obj/item/toy/spinningtoy,
/obj/item/toy/sword,
- /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus,
- /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
/obj/item/device/paicard,
/obj/item/device/violin,
/obj/item/device/guitar,
diff --git a/code/game/objects/items/weapons/grenades/bananade.dm b/code/game/objects/items/weapons/grenades/bananade.dm
index 189b4eb77c0..580cb993a63 100644
--- a/code/game/objects/items/weapons/grenades/bananade.dm
+++ b/code/game/objects/items/weapons/grenades/bananade.dm
@@ -9,7 +9,7 @@ var/turf/T
icon_state = "banana"
item_state = "flashbang"
var/deliveryamt = 8
- var/spawner_type = /obj/item/weapon/bananapeel
+ var/spawner_type = /obj/item/weapon/grown/bananapeel
/obj/item/weapon/grenade/bananade/prime()
if(spawner_type && deliveryamt)
@@ -38,7 +38,7 @@ var/turf/T
/obj/item/weapon/grenade/bananade/casing/attackby(var/obj/item/I, mob/user as mob, params)
- if(istype(I, /obj/item/weapon/bananapeel))
+ if(istype(I, /obj/item/weapon/grown/bananapeel))
if(fillamt < 9)
to_chat(usr, "You add another banana peel to the assembly.")
fillamt += 1
diff --git a/code/game/objects/items/weapons/grenades/clowngrenade.dm b/code/game/objects/items/weapons/grenades/clowngrenade.dm
index 1ce46b44957..a77bd6301b6 100644
--- a/code/game/objects/items/weapons/grenades/clowngrenade.dm
+++ b/code/game/objects/items/weapons/grenades/clowngrenade.dm
@@ -23,7 +23,7 @@
for(var/direction in alldirs)
for(i = 0; i < 2; i++)
number++
- var/obj/item/weapon/bananapeel/traitorpeel/peel = new /obj/item/weapon/bananapeel/traitorpeel(get_turf(src.loc))
+ var/obj/item/weapon/grown/bananapeel/traitorpeel/peel = new /obj/item/weapon/grown/bananapeel/traitorpeel(get_turf(src.loc))
/* var/direction = pick(alldirs)
var/spaces = pick(1;150, 2)
var/a = 0
@@ -35,7 +35,7 @@
step(peel,direction)
else
step(peel,direction)
- new /obj/item/weapon/bananapeel/traitorpeel(get_turf(src.loc))
+ new /obj/item/weapon/grown/bananapeel/traitorpeel(get_turf(src.loc))
qdel(src)
return
/*
@@ -46,40 +46,32 @@
return
if(locate(/obj/structure/window) in T)
return
- new /obj/item/weapon/bananapeel/traitorpeel(T)
+ new /obj/item/weapon/grown/bananapeel/traitorpeel(T)
*/
-/obj/item/weapon/bananapeel/traitorpeel
- name = "banana peel"
- desc = "A peel from a banana."
- icon = 'icons/obj/items.dmi'
- icon_state = "banana_peel"
- item_state = "banana_peel"
- w_class = 1
- throwforce = 0
- throw_speed = 4
- throw_range = 20
+/obj/item/weapon/grown/bananapeel/traitorpeel
- Crossed(AM as mob|obj)
- var/burned = rand(2,5)
- if(istype(AM, /mob/living/carbon))
- var/mob/living/carbon/M = AM
- if(ishuman(M))
- if(isobj(M:shoes))
- if((M:shoes.flags&NOSLIP) || (M:species.bodyflags & FEET_NOSLIP))
- return
- else
- to_chat(M, "\red Your feet feel like they're on fire!")
- M.take_overall_damage(0, max(0, (burned - 2)))
- if(!istype(M, /mob/living/carbon/slime) && !isrobot(M))
- M.slip("banana peel!", 0, 7, 4)
- M.take_organ_damage(2) // Was 5 -- TLE
- M.take_overall_damage(0, burned)
+/obj/item/weapon/grown/bananapeel/traitorpeel/Crossed(AM as mob|obj)
+ var/burned = rand(2,5)
+ if(istype(AM, /mob/living/carbon))
+ var/mob/living/carbon/M = AM
+ if(ishuman(M))
+ if(isobj(M:shoes))
+ if((M:shoes.flags&NOSLIP) || (M:species.bodyflags & FEET_NOSLIP))
+ return
+ else
+ to_chat(M, "\red Your feet feel like they're on fire!")
+ M.take_overall_damage(0, max(0, (burned - 2)))
- throw_impact(atom/hit_atom)
- var/burned = rand(1,3)
- if(istype(hit_atom ,/mob/living))
- var/mob/living/M = hit_atom
- M.take_organ_damage(0, burned)
- return ..()
\ No newline at end of file
+ if(!istype(M, /mob/living/carbon/slime) && !isrobot(M))
+ M.slip("banana peel!", 0, 7, 4)
+ M.take_organ_damage(2) // Was 5 -- TLE
+ M.take_overall_damage(0, burned)
+
+/obj/item/weapon/grown/bananapeel/traitorpeel/throw_impact(atom/hit_atom)
+ var/burned = rand(1,3)
+ if(istype(hit_atom ,/mob/living))
+ var/mob/living/M = hit_atom
+ M.take_organ_damage(0, burned)
+ return ..()
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/grenades/clusterbuster.dm b/code/game/objects/items/weapons/grenades/clusterbuster.dm
index 851c625b765..e238e3bda25 100644
--- a/code/game/objects/items/weapons/grenades/clusterbuster.dm
+++ b/code/game/objects/items/weapons/grenades/clusterbuster.dm
@@ -170,7 +170,7 @@
/obj/item/weapon/grenade/clusterbuster/honk
name = "Mega Honk Grenade"
- payload = /obj/item/weapon/bananapeel
+ payload = /obj/item/weapon/grown/bananapeel
/obj/item/weapon/grenade/clusterbuster/honk_evil
name = "Evil Mega Honk Grenade"
diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
index e93437fbe76..fe3cb3a0c12 100644
--- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm
+++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
@@ -20,6 +20,7 @@
for(var/i=1, i<=deliveryamt, i++)
var/atom/movable/x = new spawner_type
+ x.admin_spawned = admin_spawned
x.loc = T
if(prob(50))
for(var/j = 1, j <= rand(1, 3), j++)
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index d7e4b3b7b23..7b1187bcc50 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -62,6 +62,15 @@
target.update_handcuffed()
return
+/obj/item/weapon/restraints/handcuffs/sinew
+ name = "sinew restraints"
+ desc = "A pair of restraints fashioned from long strands of flesh."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "sinewcuff"
+ item_state = "sinewcuff"
+ breakouttime = 300 //Deciseconds = 30s
+ cuffsound = 'sound/weapons/cablecuff.ogg'
+
/obj/item/weapon/restraints/handcuffs/cable
name = "cable restraints"
desc = "Looks like some cables tied together. Could be used to tie something up."
diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm
index 78a88efdadb..d82ec9fdf00 100644
--- a/code/game/objects/items/weapons/holy_weapons.dm
+++ b/code/game/objects/items/weapons/holy_weapons.dm
@@ -189,7 +189,7 @@
sharp = 1
edge = 1
attack_verb = list("chopped", "sliced", "cut", "reaped")
- hitsound = 'sound/weapons/bladeslice.ogg'
+ hitsound = 'sound/weapons/rapierhit.ogg'
/obj/item/weapon/nullrod/scythe/vibro
name = "high frequency blade"
@@ -197,6 +197,14 @@
item_state = "hfrequency1"
desc = "Bad references are the DNA of the soul."
attack_verb = list("chopped", "sliced", "cut", "zandatsu'd")
+
+/obj/item/weapon/nullrod/scythe/spellblade
+ icon_state = "spellblade"
+ item_state = "spellblade"
+ icon = 'icons/obj/guns/magic.dmi'
+ name = "dormant spellblade"
+ desc = "The blade grants the wielder nearly limitless power...if they can figure out how to turn it on, that is."
+ hitsound = 'sound/weapons/rapierhit.ogg'
/obj/item/weapon/nullrod/scythe/talking
name = "possessed blade"
@@ -204,7 +212,7 @@
item_state = "talking_sword"
desc = "When the station falls into chaos, it's nice to have a friend by your side."
attack_verb = list("chopped", "sliced", "cut")
- hitsound = 'sound/weapons/bladeslice.ogg'
+ hitsound = 'sound/weapons/rapierhit.ogg'
var/possessed = FALSE
/obj/item/weapon/nullrod/scythe/talking/attack_self(mob/living/user)
diff --git a/code/game/objects/items/weapons/implants/implant_storage.dm b/code/game/objects/items/weapons/implants/implant_storage.dm
index 454c08f9df1..fba9c1377ef 100644
--- a/code/game/objects/items/weapons/implants/implant_storage.dm
+++ b/code/game/objects/items/weapons/implants/implant_storage.dm
@@ -49,6 +49,10 @@
return ..()
+/obj/item/weapon/implant/storage/proc/get_contents() //Used for swiftly returning a list of the implant's contents i.e. for checking a theft objective's completion.
+ if(storage && storage.contents)
+ return storage.contents
+
/obj/item/weapon/implanter/storage
name = "implanter (storage)"
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index 183f07bb21c..069bf06ddfb 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -152,6 +152,17 @@
origin_tech = "materials=2;combat=4"
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
+/obj/item/weapon/kitchen/knife/carrotshiv
+ name = "carrot shiv"
+ icon_state = "carrotshiv"
+ item_state = "carrotshiv"
+ desc = "Unlike other carrots, you should probably keep this far away from your eyes."
+ force = 8
+ throwforce = 12 //fuck git
+ materials = list()
+ origin_tech = "biotech=3;combat=2"
+ attack_verb = list("shanked", "shivved")
+
/*
* Rolling Pins
*/
diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm
index f4b7946d0ca..7a05ca00cb6 100644
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -35,7 +35,7 @@
edge = 1
origin_tech = "combat=5"
attack_verb = list("lunged at", "stabbed")
- hitsound = 'sound/weapons/slash.ogg'
+ hitsound = 'sound/weapons/rapierhit.ogg'
materials = list(MAT_METAL = 1000)
/obj/item/weapon/melee/rapier/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm
index 92bb7ac4c07..005ef313a4f 100644
--- a/code/game/objects/items/weapons/power_cells.dm
+++ b/code/game/objects/items/weapons/power_cells.dm
@@ -18,6 +18,25 @@
var/minor_fault = 0 //If not 100% reliable, it will build up faults.
var/chargerate = 1000 //how much power is given every tick in a recharger
var/self_recharge = 0 //does it self recharge, over time, or not?
+ var/grown_battery = FALSE // If it's a grown that acts as a battery, add a wire overlay to it.
+
+/obj/item/weapon/stock_parts/cell/New()
+ ..()
+ processing_objects.Add(src)
+ charge = maxcharge
+ updateicon()
+
+/obj/item/weapon/stock_parts/cell/Destroy()
+ processing_objects.Remove(src)
+ return ..()
+
+/obj/item/weapon/stock_parts/cell/on_varedit(modified_var)
+ if(modified_var == "self_recharge")
+ if(self_recharge)
+ processing_objects.Add(src)
+ else
+ processing_objects.Remove(src)
+ ..()
/obj/item/weapon/stock_parts/cell/suicide_act(mob/user)
to_chat(viewers(user), "[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide.")
@@ -29,6 +48,17 @@
else
return PROCESS_KILL
+/obj/item/weapon/stock_parts/cell/proc/updateicon()
+ overlays.Cut()
+ if(grown_battery)
+ overlays += image('icons/obj/power.dmi', "grown_wires")
+ if(charge < 0.01)
+ return
+ else if(charge/maxcharge >=0.995)
+ overlays += image('icons/obj/power.dmi', "cell-o2")
+ else
+ overlays += image('icons/obj/power.dmi', "cell-o1")
+
/obj/item/weapon/stock_parts/cell/crap
name = "\improper Nanotrasen brand rechargable AA battery"
desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
@@ -119,14 +149,15 @@
/obj/item/weapon/stock_parts/cell/potato
name = "potato battery"
desc = "A rechargable starch based power cell."
- origin_tech = "powerstorage=1"
- icon = 'icons/obj/power.dmi' //'icons/obj/harvest.dmi'
- icon_state = "potato_cell" //"potato_battery"
+ icon = 'icons/obj/hydroponics/harvest.dmi'
+ icon_state = "potato"
+ origin_tech = "powerstorage=1;biotech=1"
charge = 100
maxcharge = 3000
- rating = 1
materials = list()
+ rating = 1
minor_fault = 1
+ grown_battery = TRUE //it has the overlays for wires
/obj/item/weapon/stock_parts/cell/high/slime
name = "charged slime core"
diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm
index eefd3b7d0f6..0167ab589be 100644
--- a/code/game/objects/items/weapons/powerfist.dm
+++ b/code/game/objects/items/weapons/powerfist.dm
@@ -87,7 +87,7 @@
target.apply_damage(force * fisto_setting, BRUTE)
target.visible_message("[user]'s powerfist lets out a loud hiss as they punch [target.name]!", \
"You cry out in pain as [user]'s punch flings you backwards!")
- new/obj/effect/kinetic_blast(target.loc)
+ new /obj/effect/overlay/temp/kinetic_blast(target.loc)
playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1)
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index ef0cdfc329b..49ba664619f 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -159,52 +159,34 @@
// -----------------------------
/obj/item/weapon/storage/bag/plants
- icon = 'icons/obj/hydroponics.dmi'
+ name = "plant bag"
+ icon = 'icons/obj/hydroponics/equipment.dmi'
icon_state = "plantbag"
- name = "Plant Bag"
- storage_slots = 50; //the number of plant pieces it can carry.
- max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
+ storage_slots = 100 //the number of plant pieces it can carry.
+ max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
max_w_class = 3
w_class = 1
- can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/grown","/obj/item/seeds","/obj/item/weapon/grown", "/obj/item/stack/tile/grass","/obj/item/stack/medical/ointment/aloe","/obj/item/stack/medical/bruise_pack/comfrey", "/obj/item/weapon/reagent_containers/honeycomb")
+ can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/grown","/obj/item/seeds","/obj/item/weapon/grown","/obj/item/weapon/reagent_containers/food/snacks/ash_flora")
burn_state = FLAMMABLE
/obj/item/weapon/storage/bag/plants/portaseeder
name = "portable seed extractor"
desc = "For the enterprising botanist on the go. Less efficient than the stationary model, it creates one seed per plant."
icon_state = "portaseeder"
+ origin_tech = "biotech=3;engineering=2"
/obj/item/weapon/storage/bag/plants/portaseeder/verb/dissolve_contents()
set name = "Activate Seed Extraction"
set category = "Object"
set desc = "Activate to convert your plants into plantable seeds."
- if(usr.stat || !usr.canmove || usr.restrained())
+
+ if(usr.incapacitated())
return
for(var/obj/item/O in contents)
- if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown) || istype(O, /obj/item/weapon/grown))
-
- var/datum/seed/new_seed_type
- if(istype(O, /obj/item/weapon/grown))
- var/obj/item/weapon/grown/F = O
- new_seed_type = plant_controller.seeds[F.plantname]
- else
- var/obj/item/weapon/reagent_containers/food/snacks/grown/F = O
- new_seed_type = plant_controller.seeds[F.plantname]
-
- if(new_seed_type)
- var/obj/item/seeds/seeds = new(O.loc, O)
- seeds.seed_type = new_seed_type.name
- seeds.update_seed()
- qdel(O)
-
- if(istype(O, /obj/item/stack/tile/grass))
- var/obj/item/stack/tile/grass/S = O
- S.use(1)
- new /obj/item/seeds/grassseed(O.loc, O)
-
+ seedify(O, 1)
for(var/mob/M in range(1))
if(M.s_active == src)
- src.close(M)
+ close(M)
// -----------------------------
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index ab97555c237..fe29ba5c23a 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -139,8 +139,8 @@
item_state = "botany"
use_item_overlays = 1
can_hold = list(
- "/obj/item/device/analyzer/plant_analyzer",
- "/obj/item/weapon/minihoe",
+ "/obj/item/device/plant_analyzer",
+ "/obj/item/weapon/cultivator",
"/obj/item/weapon/hatchet",
"/obj/item/weapon/reagent_containers/glass/bottle",
"/obj/item/weapon/plantspray",
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index bfdc3a80727..88820290a48 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -391,59 +391,32 @@
icon_state = "monkeycubebox"
storage_slots = 7
can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/monkeycube")
- New()
- ..()
- for(var/i = 1; i <= 5; i++)
- new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped(src)
-/obj/item/weapon/storage/box/farwacubes
+ var/monkey_cube_type = /obj/item/weapon/reagent_containers/food/snacks/monkeycube
+
+/obj/item/weapon/storage/box/monkeycubes/New()
+ ..()
+ for(var/i in 1 to 5)
+ new monkey_cube_type(src)
+
+/obj/item/weapon/storage/box/monkeycubes/farwacubes
name = "farwa cube box"
desc = "Drymate brand farwa cubes. Just add water!"
- icon = 'icons/obj/food/food.dmi'
- icon_state = "monkeycubebox"
- storage_slots = 7
- can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/farwacube")
- New()
- ..()
- for(var/i = 1; i <= 5; i++)
- new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/farwacube(src)
+ monkey_cube_type = /obj/item/weapon/reagent_containers/food/snacks/monkeycube/farwacube
-/obj/item/weapon/storage/box/stokcubes
+/obj/item/weapon/storage/box/monkeycubes/stokcubes
name = "stok cube box"
desc = "Drymate brand stok cubes. Just add water!"
- icon = 'icons/obj/food/food.dmi'
- icon_state = "monkeycubebox"
- storage_slots = 7
- can_hold = list("/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/stokcube")
- New()
- ..()
- for(var/i = 1; i <= 5; i++)
- new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/stokcube(src)
+ monkey_cube_type = /obj/item/weapon/reagent_containers/food/snacks/monkeycube/stokcube
-/obj/item/weapon/storage/box/neaeracubes
+/obj/item/weapon/storage/box/monkeycubes/neaeracubes
name = "neaera cube box"
desc = "Drymate brand neaera cubes. Just add water!"
- icon = 'icons/obj/food/food.dmi'
- icon_state = "monkeycubebox"
- storage_slots = 7
- can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube")
- New()
- ..()
- for(var/i = 1; i <= 5; i++)
- new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube(src)
+ monkey_cube_type = /obj/item/weapon/reagent_containers/food/snacks/monkeycube/neaeracube
-
-/obj/item/weapon/storage/box/wolpincubes
+/obj/item/weapon/storage/box/monkeycubes/wolpincubes
name = "wolpin cube box"
desc = "Drymate brand wolpin cubes. Just add water!"
- icon = 'icons/obj/food/food.dmi'
- icon_state = "monkeycubebox"
- storage_slots = 7
- can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube")
- New()
- ..()
- for(var/i = 1; i <= 5; i++)
- new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube(src)
-
+ monkey_cube_type = /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wolpincube
/obj/item/weapon/storage/box/permits
name = "box of construction permits"
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 9a9cf319319..168196f0480 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -315,6 +315,26 @@
item_state = "cigpacket"
cigarette_type = /obj/item/clothing/mask/cigarette/random
+/obj/item/weapon/storage/fancy/rollingpapers
+ name = "rolling paper pack"
+ desc = "A pack of NanoTrasen brand rolling papers."
+ w_class = 1
+ icon = 'icons/obj/cigarettes.dmi'
+ icon_state = "cig_paper_pack"
+ storage_slots = 10
+ icon_type = "rolling paper"
+ can_hold = list("/obj/item/weapon/rollingpaper")
+
+/obj/item/weapon/storage/fancy/rollingpapers/New()
+ ..()
+ for(var/i in 1 to storage_slots)
+ new /obj/item/weapon/rollingpaper(src)
+
+/obj/item/weapon/storage/fancy/rollingpapers/update_icon()
+ overlays.Cut()
+ if(!contents.len)
+ overlays += "[icon_state]_empty"
+
/*
* Vial Box
*/
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 40f56f7000f..cdf123f2982 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -298,7 +298,7 @@
usr.update_icons() //update our overlays
if(silent)
prevent_warning = 1
- W.loc = src
+ W.forceMove(src)
W.on_enter_storage(src)
if(usr)
if(usr.client && usr.s_active != src)
@@ -344,9 +344,9 @@
else
W.layer = initial(W.layer)
W.plane = initial(W.plane)
- W.loc = new_location
+ W.forceMove(new_location)
else
- W.loc = get_turf(src)
+ W.forceMove(get_turf(src))
if(usr)
src.orient2hud(usr)
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 61d8d4fef91..f2bd9cafedf 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -29,11 +29,6 @@
bcell = null
return ..()
-/obj/item/weapon/melee/baton/CheckParts(list/parts_list)
- ..()
- bcell = locate(/obj/item/weapon/stock_parts/cell) in contents
- update_icon()
-
/obj/item/weapon/melee/baton/loaded/New() //this one starts with a cell pre-installed.
..()
bcell = new(src)
@@ -200,8 +195,18 @@
desc = "An improvised stun baton."
icon_state = "stunprod_nocell"
item_state = "prod"
+ w_class = 3
force = 3
throwforce = 5
stunforce = 5
hitcost = 3750
- slot_flags = null
+ slot_flags = SLOT_BACK
+ var/obj/item/device/assembly/igniter/sparkler = 0
+
+/obj/item/weapon/melee/baton/cattleprod/New()
+ ..()
+ sparkler = new (src)
+
+/obj/item/weapon/melee/baton/cattleprod/baton_stun()
+ if(sparkler.activate())
+ ..()
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 176108b8f08..402453f8007 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -12,47 +12,42 @@
* Revolver Conversion Kit
*/
-/*
- * Wrench
- */
+//Wrench
/obj/item/weapon/wrench
name = "wrench"
desc = "A wrench with common uses. Can be found in your hand."
- icon = 'icons/obj/items.dmi'
+ icon = 'icons/obj/tools.dmi'
icon_state = "wrench"
flags = CONDUCT
slot_flags = SLOT_BELT
- force = 5.0
- throwforce = 7.0
+ force = 5
+ throwforce = 7
w_class = 2
materials = list(MAT_METAL=150)
origin_tech = "materials=1;engineering=1"
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
-
-/*
- * Screwdriver
- */
+//Screwdriver
/obj/item/weapon/screwdriver
name = "screwdriver"
desc = "You can be totally screwy with this."
- icon = 'icons/obj/items.dmi'
+ icon = 'icons/obj/tools.dmi'
icon_state = "screwdriver"
flags = CONDUCT
slot_flags = SLOT_BELT
- force = 5.0
+ force = 5
w_class = 1
- throwforce = 5.0
+ throwforce = 5
throw_speed = 3
throw_range = 5
materials = list(MAT_METAL=75)
attack_verb = list("stabbed")
hitsound = 'sound/weapons/bladeslice.ogg'
- suicide_act(mob/user)
- to_chat(viewers(user), pick("[user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.", \
- "[user] is stabbing the [src.name] into \his heart! It looks like \he's trying to commit suicide."))
- return(BRUTELOSS)
+/obj/item/weapon/screwdriver/suicide_act(mob/user)
+ to_chat(viewers(user), pick("[user] is stabbing the [name] into \his temple! It looks like \he's trying to commit suicide.", \
+ "[user] is stabbing the [name] into \his heart! It looks like \he's trying to commit suicide."))
+ return(BRUTELOSS)
/obj/item/weapon/screwdriver/New()
switch(pick("red","blue","purple","brown","green","cyan","yellow"))
@@ -82,7 +77,7 @@
src.pixel_y = rand(0, 16)
return
-/obj/item/weapon/screwdriver/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+/obj/item/weapon/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user)
if(!istype(M) || user.a_intent == I_HELP)
return ..()
if(user.zone_sel.selecting != "eyes" && user.zone_sel.selecting != "head")
@@ -91,17 +86,15 @@
M = user
return eyestab(M,user)
-/*
- * Wirecutters
- */
+//Wirecutters
/obj/item/weapon/wirecutters
name = "wirecutters"
desc = "This cuts wires."
- icon = 'icons/obj/items.dmi'
+ icon = 'icons/obj/tools.dmi'
icon_state = "cutters"
flags = CONDUCT
slot_flags = SLOT_BELT
- force = 6.0
+ force = 6
throw_speed = 3
throw_range = 7
w_class = 2
@@ -112,51 +105,40 @@
sharp = 1
edge = 1
-/obj/item/weapon/wirecutters/New(loc, var/param_color = null)
+/obj/item/weapon/wirecutters/New(loc, param_color = null)
..()
if((!param_color && prob(50)) || param_color == "yellow")
icon_state = "cutters-y"
item_state = "cutters_yellow"
-/obj/item/weapon/wirecutters/attack(mob/living/carbon/human/C as mob, mob/user as mob)
- if(istype(C) && C.handcuffed)
- if(istype(C.handcuffed, /obj/item/weapon/restraints/handcuffs/cable))
- usr.visible_message("\The [usr] cuts \the [C]'s restraints with \the [src]!",\
- "You cut \the [C]'s restraints with \the [src]!",\
+/obj/item/weapon/wirecutters/attack(mob/living/carbon/human/H, mob/user)
+ if(istype(H) && H.handcuffed)
+ if(istype(H.handcuffed, /obj/item/weapon/restraints/handcuffs/cable))
+ usr.visible_message("\The [usr] cuts \the [H]'s restraints with \the [src]!",\
+ "You cut \the [H]'s restraints with \the [src]!",\
"You hear cable being cut.")
- C.handcuffed = null
- if(C.buckled && C.buckled.buckle_requires_restraints)
- C.buckled.unbuckle_mob()
- C.update_handcuffed()
+ H.handcuffed = null
+ if(H.buckled && H.buckled.buckle_requires_restraints)
+ H.buckled.unbuckle_mob()
+ H.update_handcuffed()
return
else
..()
-/*
- * Welding Tool
- */
+//Welding Tool
/obj/item/weapon/weldingtool
name = "welding tool"
- icon = 'icons/obj/items.dmi'
+ icon = 'icons/obj/tools.dmi'
icon_state = "welder"
- item_state = "welder"
flags = CONDUCT
slot_flags = SLOT_BELT
-
- //Amount of OUCH when it's thrown
force = 3
throwforce = 5
throw_speed = 3
throw_range = 5
w_class = 2
-
- //Cost to make in the autolathe
materials = list(MAT_METAL=70, MAT_GLASS=30)
-
- //R&D tech level
origin_tech = "engineering=1"
-
- //Welding tool specific stuff
var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2)
var/status = 1 //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower)
var/max_fuel = 20 //The max amount of fuel the welder can hold
@@ -198,8 +180,8 @@
update_torch()
return
-/obj/item/weapon/weldingtool/attackby(obj/item/I as obj, mob/user as mob, params)
- if(istype(I, /obj/item/weapon/screwdriver))
+/obj/item/weapon/weldingtool/attackby(obj/item/I, mob/user, params)
+ if(isscrewdriver(I))
flamethrower_screwdriver(I, user)
if(istype(I, /obj/item/stack/rods))
flamethrower_rods(I, user)
@@ -231,7 +213,7 @@
if(isturf(location))
location.hotspot_expose(700, 5)
-/obj/item/weapon/weldingtool/attack(mob/M as mob, mob/user as mob)
+/obj/item/weapon/weldingtool/attack(mob/M, mob/user)
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/S = H.organs_by_name[user.zone_sel.selecting]
@@ -266,22 +248,9 @@
else
return ..()
-/obj/item/weapon/weldingtool/afterattack(obj/O as obj, mob/user as mob, proximity)
- if(!proximity) return
- if(istype(O, /obj/structure/reagent_dispensers/fueltank) && in_range(src, O))
- if(!welding)
- O.reagents.trans_to(src, max_fuel)
- to_chat(user, "[src] refueled.")
- playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
- update_icon()
- return
- else
- message_admins("[key_name_admin(user)] triggered a fueltank explosion.")
- log_game("[key_name(user)] triggered a fueltank explosion.")
- to_chat(user, "That was stupid of you.")
- O.ex_act()
- return
-
+/obj/item/weapon/weldingtool/afterattack(atom/O, mob/user, proximity)
+ if(!proximity)
+ return
if(welding)
remove_fuel(1)
var/turf/location = get_turf(user)
@@ -289,7 +258,9 @@
if(isliving(O))
var/mob/living/L = O
- L.IgniteMob()
+ if(L.IgniteMob())
+ message_admins("[key_name_admin(user)] set [key_name_admin(L)] on fire")
+ log_game("[key_name(user)] set [key_name(L)] on fire")
/obj/item/weapon/weldingtool/attack_self(mob/user)
toggle(user)
@@ -300,7 +271,7 @@
return reagents.get_reagent_amount("fuel")
//Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use()
-/obj/item/weapon/weldingtool/proc/remove_fuel(var/amount = 1, var/mob/living/M = null)
+/obj/item/weapon/weldingtool/proc/remove_fuel(amount = 1, mob/living/M = null)
if(!welding || !check_fuel())
return 0
if(get_fuel() >= amount)
@@ -390,6 +361,7 @@
name = "Industrial Welding Tool"
desc = "A slightly larger welder with a larger tank."
icon_state = "indwelder"
+ icon_state = "welder"
max_fuel = 40
materials = list(MAT_METAL=70, MAT_GLASS=60)
origin_tech = "engineering=2"
@@ -413,9 +385,8 @@
/obj/item/weapon/weldingtool/hugetank
name = "Upgraded Welding Tool"
- desc = "An upgraded welder based of the industrial welder."
+ desc = "An upgraded welder based off the industrial welder."
icon_state = "upindwelder"
- item_state = "upindwelder"
max_fuel = 80
w_class = 3
materials = list(MAT_METAL=70, MAT_GLASS=120)
@@ -425,15 +396,14 @@
name = "Experimental Welding Tool"
desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes."
icon_state = "exwelder"
- item_state = "exwelder"
max_fuel = 40
w_class = 3
materials = list(MAT_METAL=70, MAT_GLASS=120)
origin_tech = "engineering=4;plasmatech=3"
- var/last_gen = 0
change_icons = 0
can_off_process = 1
light_intensity = 1
+ var/last_gen = 0
/obj/item/weapon/weldingtool/experimental/proc/fuel_gen()
if(!welding && !last_gen)
@@ -447,19 +417,16 @@
if(reagents.total_volume < max_fuel)
fuel_gen()
-/*
- * Crowbar
- */
-
+//Crowbar
/obj/item/weapon/crowbar
name = "pocket crowbar"
desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors."
- icon = 'icons/obj/items.dmi'
+ icon = 'icons/obj/tools.dmi'
icon_state = "crowbar"
flags = CONDUCT
slot_flags = SLOT_BELT
- force = 5.0
- throwforce = 7.0
+ force = 5
+ throwforce = 7
item_state = "crowbar"
w_class = 2
materials = list(MAT_METAL=50)
@@ -467,7 +434,6 @@
attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
/obj/item/weapon/crowbar/red
- icon = 'icons/obj/items.dmi'
icon_state = "red_crowbar"
item_state = "crowbar_red"
@@ -491,14 +457,14 @@
origin_tech = "combat=2"
var/open = 0
- New()
- ..()
- update_icon()
-
+/obj/item/weapon/conversion_kit/New()
+ ..()
update_icon()
- icon_state = "[initial(icon_state)]_[open]"
- attack_self(mob/user as mob)
- open = !open
- to_chat(user, "\blue You [open?"open" : "close"] the conversion kit.")
- update_icon()
+/obj/item/weapon/conversion_kit/update_icon()
+ icon_state = "[initial(icon_state)]_[open]"
+
+/obj/item/weapon/conversion_kit/attack_self(mob/user)
+ open = !open
+ to_chat(user, "\blue You [open?"open" : "close"] the conversion kit.")
+ update_icon()
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 8e9424c4997..5c66759dc52 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -431,6 +431,7 @@
icon_state = "gchainsaw_off"
flags = CONDUCT
force = 13
+ var/force_on = 21
w_class = 5
throwforce = 13
throw_speed = 2
@@ -449,8 +450,8 @@
to_chat(user, "As you pull the starting cord dangling from [src], [on ? "it begins to whirr." : "the chain stops moving."]")
if(on)
playsound(loc, 'sound/weapons/chainsawstart.ogg', 50, 1)
- force = on ? 21 : 13
- throwforce = on ? 21 : 13
+ force = on ? force_on : initial(force)
+ throwforce = on ? force_on : initial(force)
icon_state = "gchainsaw_[on ? "on" : "off"]"
if(hitsound == "swing_hit")
@@ -469,6 +470,14 @@
name = "OOOH BABY"
desc = "VRRRRRRR!!!"
armour_penetration = 100
+ force_on = 30
+
+/obj/item/weapon/twohanded/required/chainsaw/doomslayer/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
+ if(attack_type == PROJECTILE_ATTACK)
+ owner.visible_message("Ranged attacks just make [owner] angrier!")
+ playsound(src, pick('sound/weapons/bulletflyby.ogg','sound/weapons/bulletflyby2.ogg','sound/weapons/bulletflyby3.ogg'), 75, 1)
+ return 1
+ return 0
///CHAINSAW///
diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm
index a6a53b03606..3fb54c16609 100644
--- a/code/game/objects/items/weapons/vending_items.dm
+++ b/code/game/objects/items/weapons/vending_items.dm
@@ -82,3 +82,8 @@
machine_name = "CritterCare"
icon_state = "refill_pet"
charges = 31// of 94
+
+/obj/item/weapon/vending_refill/chinese
+ machine_name = "MrChangs"
+ charges = 8// of 24
+
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index b9c946c6210..3c8a25ca739 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -23,18 +23,14 @@
slot_flags = SLOT_BELT
force = 2
throwforce = 1
- sharp = 1
- edge = 1
w_class = 3
+ hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- suicide_act(mob/user)
- to_chat(viewers(user), "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.")
- return(BRUTELOSS)
-
-/obj/item/weapon/sord/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
- playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
- return ..()
+/obj/item/weapon/sord/suicide_act(mob/user)
+ user.visible_message("[user] is trying to impale themself with [src]! It might be a suicide attempt if it weren't so shitty.", \
+ "You try to impale yourself with [src], but it's USELESS...")
+ return SHAME
/obj/item/weapon/claymore
name = "claymore"
@@ -105,10 +101,10 @@ obj/item/weapon/wirerod
force = 9
throwforce = 10
w_class = 3
- materials = list(MAT_METAL=1000)
+ materials = list(MAT_METAL=1150, MAT_GLASS=75)
attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
-obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params)
+obj/item/weapon/wirerod/attackby(obj/item/I, mob/user, params)
..()
if(istype(I, /obj/item/weapon/shard))
var/obj/item/weapon/twohanded/spear/S = new /obj/item/weapon/twohanded/spear
@@ -122,7 +118,7 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params)
qdel(I)
qdel(src)
- else if(istype(I, /obj/item/weapon/wirecutters))
+ else if(istype(I, /obj/item/device/assembly/igniter) && !(I.flags & NODROP))
var/obj/item/weapon/melee/baton/cattleprod/P = new /obj/item/weapon/melee/baton/cattleprod
if(!remove_item_from_storage(user))
@@ -130,7 +126,7 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params)
user.unEquip(I)
user.put_in_hands(P)
- to_chat(user, "You fasten the wirecutters to the top of the rod with the cable, prongs outward.")
+ to_chat(user, "You fasten [I] to the top of the rod with the cable.")
qdel(I)
qdel(src)
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 26908f69180..e213c555c43 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -16,6 +16,7 @@
var/cutting_sound = 'sound/items/Welder.ogg'
var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate then open it in a populated area to crash clients.
var/material_drop = /obj/item/stack/sheet/metal
+ var/material_drop_amount = 2
/obj/structure/closet/New()
..()
@@ -49,28 +50,13 @@
return 1
/obj/structure/closet/proc/dump_contents()
- //Cham Projector Exception
- for(var/obj/effect/dummy/chameleon/AD in src)
- AD.forceMove(loc)
-
- for(var/obj/I in src)
- I.forceMove(loc)
-
- for(var/mob/M in src)
- moveMob(M, loc)
-
-/obj/structure/closet/proc/moveMob(var/mob/M, var/atom/destination)
- loc.Exited(M)
- M.loc = destination
- M.reset_perspective(destination)
- if(isturf(loc))
- loc.Entered(M, src, ignoreRest = 1)
- else
- loc.Entered(M, src)
- for(var/atom/movable/AM in loc)
- if(istype(AM, /obj/item))
- continue
- AM.Crossed(M)
+ var/turf/T = get_turf(src)
+ for(var/atom/movable/AM in src)
+ AM.forceMove(T)
+ if(throwing) // you keep some momentum when getting out of a thrown closet
+ step(AM, dir)
+ if(throwing)
+ throwing = 0
/obj/structure/closet/proc/open()
if(src.opened)
@@ -120,7 +106,7 @@
if(M.buckled)
continue
- moveMob(M, src)
+ M.forceMove(src)
itemcount++
src.icon_state = src.icon_closed
@@ -271,7 +257,7 @@
"You cut \the [src] apart with \the [WT].",
"You hear welding.")
var/turf/T = get_turf(src)
- new material_drop(T)
+ new material_drop(T, material_drop_amount)
qdel(src)
return
if(isrobot(user))
@@ -425,4 +411,4 @@
/obj/structure/closet/get_remote_view_fullscreens(mob/user)
if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS)))
- user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)
+ user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
index c18fd1a9b74..a5c125a8b35 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
@@ -9,18 +9,18 @@
icon_off = "hydrosecureoff"
- New()
- ..()
- switch(rand(1,2))
- if(1)
- new /obj/item/clothing/suit/apron(src)
- if(2)
- new /obj/item/clothing/suit/apron/overalls(src)
- new /obj/item/weapon/storage/bag/plants/portaseeder(src)
- new /obj/item/clothing/under/rank/hydroponics(src)
- new /obj/item/device/analyzer/plant_analyzer(src)
- new /obj/item/device/radio/headset/headset_service(src)
- new /obj/item/device/radio/headset/headset_service(src)
- new /obj/item/clothing/mask/bandana/botany(src)
- new /obj/item/weapon/minihoe(src)
- new /obj/item/weapon/hatchet(src)
\ No newline at end of file
+/obj/structure/closet/secure_closet/hydroponics/New()
+ ..()
+ switch(rand(1,2))
+ if(1)
+ new /obj/item/clothing/suit/apron(src)
+ if(2)
+ new /obj/item/clothing/suit/apron/overalls(src)
+ new /obj/item/weapon/storage/bag/plants/portaseeder(src)
+ new /obj/item/clothing/under/rank/hydroponics(src)
+ new /obj/item/device/plant_analyzer(src)
+ new /obj/item/device/radio/headset/headset_service(src)
+ new /obj/item/clothing/mask/bandana/botany(src)
+ new /obj/item/weapon/cultivator(src)
+ new /obj/item/weapon/hatchet(src)
+ new /obj/item/weapon/storage/box/disks_plantgene(src)
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
index 936201cf75f..11cfc6a7dd5 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
@@ -18,7 +18,7 @@
new /obj/item/weapon/bikehorn(src)
new /obj/item/weapon/reagent_containers/spray/waterflower(src)
new /obj/item/toy/crayon/rainbow(src)
- new /obj/item/seeds/bananaseed(src)
+ new /obj/item/seeds/banana(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm
index c330ad11a01..3c198e4dd08 100644
--- a/code/game/objects/structures/crates_lockers/closets/statue.dm
+++ b/code/game/objects/structures/crates_lockers/closets/statue.dm
@@ -57,10 +57,9 @@
qdel(src)
/obj/structure/closet/statue/dump_contents()
-
- if(istype(src.loc, /mob/living/simple_animal/hostile/statue))
- var/mob/living/simple_animal/hostile/statue/S = src.loc
- src.loc = S.loc
+ if(istype(loc, /mob/living/simple_animal/hostile/statue))
+ var/mob/living/simple_animal/hostile/statue/S = loc
+ forceMove(S.loc)
if(S.mind)
for(var/mob/M in contents)
S.mind.transfer_to(M)
@@ -68,21 +67,16 @@
break
qdel(S)
-
- for(var/obj/O in src)
- O.loc = src.loc
-
for(var/mob/living/M in src)
M.forceMove(loc)
M.disabilities -= MUTE
M.take_overall_damage((M.health - health - 100),0) //any new damage the statue incurred is transfered to the mob
-
+
+ ..()
/obj/structure/closet/statue/open()
return
-
-
/obj/structure/closet/statue/open()
return
@@ -158,4 +152,4 @@ obj/structure/statue/angel
icon_state = "angelseen"
obj/structure/statue/corgi
- icon_state = "corgi"
+ icon_state = "corgi"
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index bf74c11ee84..23f5330e48a 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -3,7 +3,7 @@
/obj/structure/closet/crate
name = "crate"
desc = "A rectangular steel crate."
- icon = 'icons/obj/storage.dmi'
+ icon = 'icons/obj/crates.dmi'
icon_state = "crate"
icon_opened = "crateopen"
icon_closed = "crate"
@@ -490,7 +490,6 @@
/obj/structure/closet/crate/large
name = "large crate"
desc = "A hefty metal crate."
- icon = 'icons/obj/storage.dmi'
icon_state = "largemetal"
icon_opened = "largemetalopen"
icon_closed = "largemetal"
@@ -515,7 +514,6 @@
/obj/structure/closet/crate/secure/large
name = "large crate"
desc = "A hefty metal crate with an electronic locking system."
- icon = 'icons/obj/storage.dmi'
icon_state = "largemetal"
icon_opened = "largemetalopen"
icon_closed = "largemetal"
@@ -568,9 +566,42 @@
new /obj/item/weapon/wirecutters(src)
new /obj/item/weapon/shovel/spade(src)
new /obj/item/weapon/shovel/spade(src)
- new /obj/item/weapon/storage/box/botanydisk(src)
- new /obj/item/weapon/storage/box/botanydisk(src)
new /obj/item/weapon/storage/box/beakers(src)
new /obj/item/weapon/storage/box/beakers(src)
new /obj/item/weapon/hand_labeler(src)
new /obj/item/weapon/hand_labeler(src)
+
+/obj/structure/closet/crate/sci
+ name = "science crate"
+ desc = "A science crate."
+ icon_state = "scicrate"
+ icon_opened = "scicrateopen"
+ icon_closed = "scicrate"
+
+/obj/structure/closet/crate/secure/scisec
+ name = "secure science crate"
+ desc = "A crate with a lock on it, painted in the scheme of the station's scientists."
+ icon_state = "scisecurecrate"
+ icon_opened = "scisecurecrateopen"
+ icon_closed = "scisecurecrate"
+
+/obj/structure/closet/crate/engineering
+ name = "engineering crate"
+ desc = "An engineering crate."
+ icon_state = "engicrate"
+ icon_opened = "engicrateopen"
+ icon_closed = "engicrate"
+
+/obj/structure/closet/crate/secure/engineering
+ name = "secure engineering crate"
+ desc = "A crate with a lock on it, painted in the scheme of the station's engineers."
+ icon_state = "engisecurecrate"
+ icon_opened = "engisecurecrateopen"
+ icon_closed = "engisecurecrate"
+
+/obj/structure/closet/crate/engineering/electrical
+ name = "electrical engineering crate"
+ desc = "An electrical engineering crate."
+ icon_state = "electricalcrate"
+ icon_opened = "electricalcrateopen"
+ icon_closed = "electricalcrate"
diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm
index d19600989be..4fe6715a05a 100644
--- a/code/game/objects/structures/crates_lockers/largecrate.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate.dm
@@ -1,8 +1,8 @@
/obj/structure/largecrate
name = "large crate"
desc = "A hefty wooden crate."
- icon = 'icons/obj/storage.dmi'
- icon_state = "densecrate"
+ icon = 'icons/obj/crates.dmi'
+ icon_state = "largecrate"
density = 1
var/obj/item/weapon/paper/manifest/manifest
@@ -49,7 +49,6 @@
return attack_hand(user)
/obj/structure/largecrate/mule
- icon_state = "mulecrate"
/obj/structure/largecrate/lisa
icon_state = "lisacrate"
diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm
index 9d7bbc96e1b..104fac7fd69 100644
--- a/code/game/objects/structures/curtains.dm
+++ b/code/game/objects/structures/curtains.dm
@@ -27,7 +27,7 @@
..()
/obj/structure/curtain/proc/toggle()
- opacity = !opacity
+ set_opacity(!opacity)
if(opacity)
icon_state = "closed"
layer = SHOWER_CLOSED_LAYER
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 9dddd902740..dc7152bbd5f 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -1,4 +1,4 @@
-obj/structure/door_assembly
+/obj/structure/door_assembly
icon = 'icons/obj/doors/door_assembly.dmi'
name = "Airlock Assembly"
@@ -14,119 +14,114 @@ obj/structure/door_assembly
var/glass = 0 // 0 = glass can be installed. -1 = glass can't be installed. 1 = glass is already installed. Text = mineral plating is installed instead.
var/created_name = null
- New()
- update_state()
+/obj/structure/door_assembly/New()
+ update_state()
-obj/structure/door_assembly/door_assembly_com
+/obj/structure/door_assembly/door_assembly_com
base_icon_state = "com"
base_name = "Command Airlock"
glass_type = "/glass_command"
airlock_type = "/command"
-obj/structure/door_assembly/door_assembly_sec
+/obj/structure/door_assembly/door_assembly_sec
base_icon_state = "sec"
base_name = "Security Airlock"
glass_type = "/glass_security"
airlock_type = "/security"
-obj/structure/door_assembly/door_assembly_eng
+/obj/structure/door_assembly/door_assembly_eng
base_icon_state = "eng"
base_name = "Engineering Airlock"
glass_type = "/glass_engineering"
airlock_type = "/engineering"
-obj/structure/door_assembly/door_assembly_min
+/obj/structure/door_assembly/door_assembly_min
base_icon_state = "min"
base_name = "Mining Airlock"
glass_type = "/glass_mining"
airlock_type = "/mining"
-obj/structure/door_assembly/door_assembly_atmo
+/obj/structure/door_assembly/door_assembly_atmo
base_icon_state = "atmo"
base_name = "Atmospherics Airlock"
glass_type = "/glass_atmos"
airlock_type = "/atmos"
-obj/structure/door_assembly/door_assembly_research
+/obj/structure/door_assembly/door_assembly_research
base_icon_state = "res"
base_name = "Research Airlock"
glass_type = "/glass_research"
airlock_type = "/research"
-obj/structure/door_assembly/door_assembly_science
+/obj/structure/door_assembly/door_assembly_science
base_icon_state = "sci"
base_name = "Science Airlock"
glass_type = "/glass_science"
airlock_type = "/science"
-obj/structure/door_assembly/door_assembly_med
+/obj/structure/door_assembly/door_assembly_med
base_icon_state = "med"
base_name = "Medical Airlock"
glass_type = "/glass_medical"
airlock_type = "/medical"
-obj/structure/door_assembly/door_assembly_mai
+/obj/structure/door_assembly/door_assembly_mai
base_icon_state = "mai"
base_name = "Maintenance Airlock"
airlock_type = "/maintenance"
glass = -1
-obj/structure/door_assembly/door_assembly_ext
+/obj/structure/door_assembly/door_assembly_ext
base_icon_state = "ext"
base_name = "External Airlock"
airlock_type = "/external"
glass = -1
-obj/structure/door_assembly/door_assembly_fre
+/obj/structure/door_assembly/door_assembly_fre
base_icon_state = "fre"
base_name = "Freezer Airlock"
airlock_type = "/freezer"
glass = -1
-obj/structure/door_assembly/door_assembly_hatch
+/obj/structure/door_assembly/door_assembly_hatch
base_icon_state = "hatch"
base_name = "Airtight Hatch"
airlock_type = "/hatch"
glass = -1
-obj/structure/door_assembly/door_assembly_mhatch
+/obj/structure/door_assembly/door_assembly_mhatch
base_icon_state = "mhatch"
base_name = "Maintenance Hatch"
airlock_type = "/maintenance_hatch"
glass = -1
-
-obj/structure/door_assembly/door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly
+
+/obj/structure/door_assembly/door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly
base_icon_state = "highsec"
base_name = "High Security Airlock"
airlock_type = "/highsecurity"
glass = -1
-obj/structure/door_assembly/door_assembly_shuttle
+/obj/structure/door_assembly/door_assembly_shuttle
base_icon_state = "shuttle"
base_name = "shuttle airlock"
airlock_type = "/shuttle"
glass = -1
-obj/structure/door_assembly/multi_tile
+/obj/structure/door_assembly/multi_tile
icon = 'icons/obj/doors/door_assembly2x1.dmi'
dir = EAST
var/width = 1
-/*Temporary until we get sprites.
- glass_type = "/multi_tile/glass"
- airlock_type = "/multi_tile/maint"
- glass = 1*/
base_icon_state = "g" //Remember to delete this line when reverting "glass" var to 1.
airlock_type = "/multi_tile/glass"
glass = -1 //To prevent bugs in deconstruction process.
-
/obj/structure/door_assembly/door_assembly_cult
base_name = "cult airlock assembly"
icon = 'icons/obj/doors/Doorcult.dmi'
base_icon_state ="construction"
airlock_type = "/cult"
-obj/structure/door_assembly/multi_tile/New()
+/obj/structure/door_assembly/multi_tile/New()
if(dir in list(EAST, WEST))
bound_width = width * world.icon_size
bound_height = world.icon_size
@@ -135,7 +130,7 @@ obj/structure/door_assembly/multi_tile/New()
bound_height = width * world.icon_size
update_state()
-obj/structure/door_assembly/multi_tile/Move()
+/obj/structure/door_assembly/multi_tile/Move()
. = ..()
if(dir in list(EAST, WEST))
bound_width = width * world.icon_size
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 11a0bae8849..4d03bfcdb27 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -36,6 +36,14 @@
..()
icon_state = "tree_[rand(1, 6)]"
+/obj/structure/flora/tree/palm
+ icon = 'icons/misc/beach2.dmi'
+ icon_state = "palm1"
+
+/obj/structure/flora/tree/palm/New()
+ ..()
+ icon_state = pick("palm1","palm2")
+ pixel_x = 0
//grass
/obj/structure/flora/grass
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index b9af7b2d032..824759b35cb 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -191,7 +191,7 @@
Close()
..()
- opacity = 0
+ set_opacity(0)
/obj/structure/mineral_door/transparent/plasma
mineralType = "plasma"
@@ -228,7 +228,7 @@
flick("[mineralType]opening",src)
sleep(10)
density = 0
- opacity = 0
+ set_opacity(0)
state = 1
update_icon()
isSwitchingStates = 0
@@ -239,7 +239,7 @@
flick("[mineralType]closing",src)
sleep(10)
density = 1
- opacity = 1
+ set_opacity(1)
state = 0
update_icon()
isSwitchingStates = 0
@@ -265,7 +265,7 @@
flick("[mineralType]opening",src)
sleep(10)
density = 0
- opacity = 0
+ set_opacity(0)
state = 1
update_icon()
isSwitchingStates = 0
@@ -280,7 +280,7 @@
flick("[mineralType]closing",src)
sleep(10)
density = 1
- opacity = 1
+ set_opacity(1)
state = 0
update_icon()
isSwitchingStates = 0
diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm
index f1d9b6ac578..9b4059f1d1d 100644
--- a/code/game/objects/structures/musician.dm
+++ b/code/game/objects/structures/musician.dm
@@ -138,10 +138,10 @@
return data
/datum/song/Topic(href, href_list)
- if(!in_range(instrumentObj, usr) || (issilicon(usr) && instrumentObj.loc != usr) || !isliving(usr) || !usr.canmove || usr.restrained())
+ if(!in_range(instrumentObj, usr) || (issilicon(usr) && instrumentObj.loc != usr) || !isliving(usr) || usr.incapacitated())
usr << browse(null, "window=instrument")
usr.unset_machine()
- return
+ return 1
instrumentObj.add_fingerprint(usr)
@@ -168,6 +168,8 @@
//split into lines
spawn()
lines = splittext(t, "\n")
+ if(lines.len == 0)
+ return 1
if(copytext(lines[1],1,6) == "BPM: ")
tempo = sanitize_tempo(600 / text2num(copytext(lines[1],6)))
lines.Cut(1,2)
@@ -291,7 +293,7 @@
ui_interact(user)
/obj/structure/piano/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
- if(!user || !anchored)
+ if(!isliving(user) || user.incapacitated() || !anchored)
return
song.ui_interact(user, ui_key, ui, force_open)
diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm
index 25fe7f4a134..253f93dc7ae 100644
--- a/code/game/objects/structures/spirit_board.dm
+++ b/code/game/objects/structures/spirit_board.dm
@@ -55,11 +55,10 @@
//lighting check
var/light_amount = 0
var/turf/T = get_turf(src)
- var/atom/movable/lighting_overlay/LO = locate(/atom/movable/lighting_overlay) in T
- if(LO)
- light_amount = LO.get_clamped_lum(0.5)*10
+ if(T)
+ light_amount = T.get_lumcount(0.5) * 10
else
- light_amount = 10
+ light_amount = 10
if(light_amount > 2)
to_chat(M, "It's too bright here to use [src.name]!")
diff --git a/code/game/response_team.dm b/code/game/response_team.dm
index 6cf81f70180..3eccf7774d4 100644
--- a/code/game/response_team.dm
+++ b/code/game/response_team.dm
@@ -93,7 +93,7 @@ var/ert_request_answered = 0
if(response_team_members.len > 6)
to_chat(src, "The emergency response team is already full!")
return 0
-
+
return 1
/proc/trigger_armed_response_team(var/datum/response_team/response_team_type)
@@ -106,7 +106,7 @@ var/ert_request_answered = 0
active_team.cannot_send_team()
send_emergency_team = 0
return 0
-
+
// Respawnable players get first dibs
for(var/mob/dead/observer/M in ert_candidates)
if((M in respawnable_list) && M.JoinResponseTeam())
@@ -115,7 +115,7 @@ var/ert_request_answered = 0
for(var/mob/dead/observer/M in (ert_candidates - respawnable_list))
if(M.JoinResponseTeam())
response_team_members |= M
-
+
if(!response_team_members.len)
active_team.cannot_send_team()
send_emergency_team = 0
@@ -125,14 +125,14 @@ var/ert_request_answered = 0
for(var/mob/M in response_team_members)
if(index > emergencyresponseteamspawn.len)
index = 1
-
+
var/client/C = M.client
var/mob/living/carbon/human/new_commando = C.create_response_team(emergencyresponseteamspawn[index])
new_commando.mind.key = M.key
new_commando.key = M.key
new_commando.update_icons()
index++
-
+
send_emergency_team = 0
active_team.announce_team()
return 1
@@ -170,8 +170,8 @@ var/ert_request_answered = 0
head_organ.b_hair = color2B(hair_c)
M.change_eye_color(color2R(eye_c), color2G(eye_c), color2B(eye_c))
M.s_tone = skin_tone
- head_organ.h_style = random_hair_style(M.gender, head_organ.species.name)
- head_organ.f_style = random_facial_hair_style(M.gender, head_organ.species.name)
+ head_organ.h_style = random_hair_style(M.gender, head_organ.species.name)
+ head_organ.f_style = random_facial_hair_style(M.gender, head_organ.species.name)
M.real_name = "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(last_names)]"
M.name = M.real_name
@@ -256,6 +256,7 @@ var/ert_request_answered = 0
pda.name = "PDA-[M.real_name] ([pda.ownjob])"
pda.icon_state = "pda-engineer"
M.equip_to_slot_or_del(pda, slot_wear_pda)
+ M.job = "ERT Engineering"
if("Security")
@@ -280,7 +281,7 @@ var/ert_request_answered = 0
pda.name = "PDA-[M.real_name] ([pda.ownjob])"
pda.icon_state = "pda-security"
M.equip_to_slot_or_del(pda, slot_wear_pda)
-
+ M.job = "ERT Security"
if("Medic")
medical_slots -= 1
@@ -302,7 +303,7 @@ var/ert_request_answered = 0
pda.name = "PDA-[M.real_name] ([pda.ownjob])"
pda.icon_state = "pda-medical"
M.equip_to_slot_or_del(pda, slot_wear_pda)
-
+ M.job = "ERT Medical"
if("Commander")
command_slots = 0
@@ -329,6 +330,7 @@ var/ert_request_answered = 0
pda.ownjob = "Emergency Response Team Leader"
pda.name = "PDA-[M.real_name] ([pda.ownjob])"
M.equip_to_slot_or_del(pda, slot_wear_pda)
+ M.job = "ERT Commander"
/datum/response_team/proc/cannot_send_team()
event_announcement.Announce("[station_name()], we are unfortunately unable to send you an Emergency Response Team at this time.", "ERT Unavailable")
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index a328769d8dc..b09ef2c168e 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -43,7 +43,35 @@
new /obj/item/weapon/ore/glass(src)
new /obj/item/weapon/ore/glass(src) //Make some sand if you shovel grass
to_chat(user, "You shovel the grass.")
+ playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1)
make_plating()
+
+// NEEDS TO BE UPDATED
+/turf/simulated/floor/basalt //By your powers combined, I am captain planet
+ name = "volcanic floor"
+ icon = 'icons/turf/floors.dmi'
+ icon_state = "basalt0"
+ oxygen = 14
+ nitrogen = 23
+ temperature = 300
+
+/turf/simulated/floor/basalt/attackby(obj/item/W, mob/user, params)
+ if(..())
+ return
+ if(istype(W, /obj/item/weapon/shovel))
+ new /obj/item/weapon/ore/glass/basalt(src)
+ new /obj/item/weapon/ore/glass/basalt(src)
+ user.visible_message("[user] digs up [src].", "You uproot [src].")
+ playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1)
+ make_plating()
+
+/turf/simulated/floor/basalt/New()
+ ..()
+ if(prob(15))
+ icon_state = "basalt[rand(0, 12)]"
+ switch(icon_state)
+ if("basalt1", "basalt2", "basalt3")
+ set_light(1, 1)
/turf/simulated/floor/carpet
name = "Carpet"
diff --git a/code/game/turfs/simulated/floor/mineral.dm b/code/game/turfs/simulated/floor/mineral.dm
index 9ef70522ec4..f4f67b9007b 100644
--- a/code/game/turfs/simulated/floor/mineral.dm
+++ b/code/game/turfs/simulated/floor/mineral.dm
@@ -1,10 +1,18 @@
+/* In this file:
+ *
+ * Plasma floor
+ * Gold floor
+ * Silver floor
+ * Bananium floor
+ * Diamond floor
+ * Uranium floor
+ */
+
/turf/simulated/floor/mineral
name = "mineral floor"
icon_state = ""
var/list/icons = list()
-
-
/turf/simulated/floor/mineral/New()
..()
broken_states = list("[initial(icon_state)]_dam")
@@ -13,9 +21,145 @@
if(!..())
return 0
if(!broken && !burnt)
- if( !(icon_state in icons) )
+ if(!(icon_state in icons))
icon_state = initial(icon_state)
+//PLASMA
+/turf/simulated/floor/mineral/plasma
+ name = "plasma floor"
+ icon_state = "plasma"
+ floor_tile = /obj/item/stack/tile/mineral/plasma
+ icons = list("plasma","plasma_dam")
+
+/turf/simulated/floor/mineral/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+ if(exposed_temperature > 300)
+ PlasmaBurn()
+
+/turf/simulated/floor/mineral/plasma/attackby(obj/item/weapon/W, mob/user, params)
+ if(is_hot(W) > 300)//If the temperature of the object is over 300, then ignite
+ message_admins("Plasma flooring was ignited by [key_name_admin(user)](?) (FLW) in ([x],[y],[z] - JMP)",0,1)
+ log_game("Plasma flooring was ignited by [key_name(user)] in ([x],[y],[z])")
+ ignite(is_hot(W))
+ return
+ ..()
+
+/turf/simulated/floor/mineral/plasma/proc/PlasmaBurn()
+ make_plating()
+ atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 20)
+
+/turf/simulated/floor/mineral/plasma/proc/ignite(exposed_temperature)
+ if(exposed_temperature > 300)
+ PlasmaBurn()
+
+//GOLD
+/turf/simulated/floor/mineral/gold
+ name = "gold floor"
+ icon_state = "gold"
+ floor_tile = /obj/item/stack/tile/mineral/gold
+ icons = list("gold","gold_dam")
+
+//SILVER
+/turf/simulated/floor/mineral/silver
+ name = "silver floor"
+ icon_state = "silver"
+ floor_tile = /obj/item/stack/tile/mineral/silver
+ icons = list("silver","silver_dam")
+
+//BANANIUM
+/turf/simulated/floor/mineral/bananium
+ name = "bananium floor"
+ icon_state = "bananium"
+ floor_tile = /obj/item/stack/tile/mineral/bananium
+ icons = list("bananium","bananium_dam")
+ var/spam_flag = 0
+
+/turf/simulated/floor/mineral/bananium/Entered(mob/AM)
+ .=..()
+ if(!.)
+ if(istype(AM))
+ squeek()
+
+/turf/simulated/floor/mineral/bananium/attackby(obj/item/weapon/W, mob/user, params)
+ .=..()
+ if(!.)
+ honk()
+
+/turf/simulated/floor/mineral/bananium/attack_hand(mob/user)
+ .=..()
+ if(!.)
+ honk()
+
+/turf/simulated/floor/mineral/bananium/proc/honk()
+ if(!spam_flag)
+ spam_flag = 1
+ playsound(src, 'sound/items/bikehorn.ogg', 50, 1)
+ spawn(20)
+ spam_flag = 0
+
+/turf/simulated/floor/mineral/bananium/proc/squeek()
+ if(!spam_flag)
+ spam_flag = 1
+ playsound(src, "clownstep", 50, 1)
+ spawn(10)
+ spam_flag = 0
+
+/turf/simulated/floor/mineral/bananium/airless
+ oxygen = 0.01
+ nitrogen = 0.01
+ temperature = TCMB
+
+//TRANQUILLITE
+/turf/simulated/floor/mineral/tranquillite
+ name = "silent floor"
+ icon_state = "tranquillite"
+ floor_tile = /obj/item/stack/tile/mineral/tranquillite
+ shoe_running_volume = 0
+ shoe_walking_volume = 0
+
+//DIAMOND
+/turf/simulated/floor/mineral/diamond
+ name = "diamond floor"
+ icon_state = "diamond"
+ floor_tile = /obj/item/stack/tile/mineral/diamond
+ icons = list("diamond","diamond_dam")
+
+//URANIUM
+/turf/simulated/floor/mineral/uranium
+ name = "uranium floor"
+ icon_state = "uranium"
+ floor_tile = /obj/item/stack/tile/mineral/uranium
+ icons = list("uranium","uranium_dam")
+ var/last_event = 0
+ var/active = null
+
+/turf/simulated/floor/mineral/uranium/Entered(mob/AM)
+ .=..()
+ if(!.)
+ if(istype(AM))
+ radiate()
+
+/turf/simulated/floor/mineral/uranium/attackby(obj/item/weapon/W, mob/user, params)
+ .=..()
+ if(!.)
+ radiate()
+
+/turf/simulated/floor/mineral/uranium/attack_hand(mob/user)
+ .=..()
+ if(!.)
+ radiate()
+
+/turf/simulated/floor/mineral/uranium/proc/radiate()
+ if(!active)
+ if(world.time > last_event+15)
+ active = 1
+ for(var/mob/living/L in range(3,src))
+ L.apply_effect(1,IRRADIATE,0)
+ for(var/turf/simulated/floor/mineral/uranium/T in orange(1,src))
+ T.radiate()
+ last_event = world.time
+ active = 0
+ return
+
// ALIEN ALLOY
/turf/simulated/floor/mineral/abductor
name = "alien floor"
@@ -36,7 +180,6 @@
/turf/simulated/floor/mineral/abductor/make_plating()
return ChangeTurf(/turf/simulated/floor/plating/abductor2)
-
/turf/simulated/floor/plating/abductor2
name = "alien plating"
icon_state = "alienplating"
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index 1a307361341..3491f4d529a 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -66,10 +66,3 @@
/turf/simulated/floor/noslip/MakeSlippery()
return
-
-/turf/simulated/floor/silent
- name = "silent floor"
- icon_state = "silent"
- floor_tile = /obj/item/stack/tile/silent
- shoe_running_volume = 0
- shoe_walking_volume = 0
\ No newline at end of file
diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm
index f5aa6198467..cbb5647f283 100644
--- a/code/game/turfs/simulated/floor/plasteel_floor.dm
+++ b/code/game/turfs/simulated/floor/plasteel_floor.dm
@@ -10,6 +10,16 @@
if(!broken && !burnt)
icon_state = icon_regular_floor
+/turf/simulated/floor/plasteel/airless
+ name = "airless floor"
+ oxygen = 0.01
+ nitrogen = 0.01
+ temperature = TCMB
+
+/turf/simulated/floor/plasteel/airless/New()
+ ..()
+ name = "floor"
+
/turf/simulated/floor/plasteel/goonplaque
icon_state = "plaque"
name = "Commemorative Plaque"
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index c6b51a05067..e9770536b73 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -76,12 +76,6 @@
..()
name = "plating"
-/turf/simulated/floor/plating/airless/catwalk
- icon = 'icons/turf/catwalks.dmi'
- icon_state = "Floor3"
- name = "catwalk"
- desc = "Cats really don't like these things."
-
/turf/simulated/floor/engine
name = "reinforced floor"
icon_state = "engine"
@@ -294,16 +288,6 @@
/turf/simulated/floor/plating/metalfoam/proc/smash()
ChangeTurf(/turf/space)
-/turf/simulated/floor/plasteel/airless
- name = "airless floor"
- oxygen = 0.01
- nitrogen = 0.01
- temperature = TCMB
-
-/turf/simulated/floor/plasteel/airless/New()
- ..()
- name = "floor"
-
/turf/simulated/floor/plating/abductor
name = "alien floor"
icon_state = "alienpod1"
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index fa67573307c..69b0df22ae3 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -4,6 +4,7 @@
luminosity = 1
var/intact = 1
+ var/turf/baseturf = /turf/space
var/slowdown = 0 //negative for faster, positive for slower
//Properties for open tiles (/floor)
@@ -23,8 +24,6 @@
var/PathNode/PNode = null //associated PathNode in the A* algorithm
- var/dynamic_lighting = 1
-
flags = 0
var/image/obscured //camerachunks
@@ -160,10 +159,11 @@
return src
var/old_opacity = opacity
var/old_dynamic_lighting = dynamic_lighting
- var/list/old_affecting_lights = affecting_lights
+ var/old_affecting_lights = affecting_lights
var/old_lighting_overlay = lighting_overlay
var/old_blueprint_data = blueprint_data
var/old_obscured = obscured
+ var/old_corners = corners
BeforeChange()
if(air_master)
@@ -177,16 +177,19 @@
for(var/turf/space/S in range(W,1))
S.update_starlight()
- lighting_overlay = old_lighting_overlay
+ recalc_atom_opacity()
- affecting_lights = old_affecting_lights
- if((old_opacity != opacity) || (dynamic_lighting != old_dynamic_lighting))
- reconsider_lights()
- if(dynamic_lighting != old_dynamic_lighting)
- if(dynamic_lighting)
- lighting_build_overlays()
- else
- lighting_clear_overlays()
+ if(lighting_overlays_initialised)
+ lighting_overlay = old_lighting_overlay
+ affecting_lights = old_affecting_lights
+ corners = old_corners
+ if((old_opacity != opacity) || (dynamic_lighting != old_dynamic_lighting))
+ reconsider_lights()
+ if(dynamic_lighting != old_dynamic_lighting)
+ if(dynamic_lighting)
+ lighting_build_overlay()
+ else
+ lighting_clear_overlay()
obscured = old_obscured
@@ -383,11 +386,6 @@
if(ticker)
cameranet.updateVisibility(src)
-/turf/proc/get_lumcount() //Gets the lighting level of a given turf.
- if(lighting_overlay)
- return lighting_overlay.get_clamped_lum()
- return 1
-
/turf/attackby(obj/item/C, mob/user, params)
if(can_lay_cable() && istype(C, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/coil = C
diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm
index 31c8c322596..896bd2b850d 100644
--- a/code/game/verbs/suicide.dm
+++ b/code/game/verbs/suicide.dm
@@ -77,6 +77,10 @@
if(held_item)
var/damagetype = held_item.suicide_act(src)
if(damagetype)
+ if(damagetype & SHAME)
+ adjustStaminaLoss(200)
+ suiciding = 0
+ return
do_suicide(damagetype, held_item)
return
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 8a664d184df..cb00562be9c 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -807,7 +807,8 @@ var/global/nologevent = 0
var/turf/T = get_turf(usr.loc)
T.ChangeTurf(chosen)
else
- new chosen(usr.loc)
+ var/atom/A = new chosen(usr.loc)
+ A.admin_spawned = TRUE
log_admin("[key_name(usr)] spawned [chosen] at ([usr.x],[usr.y],[usr.z])")
feedback_add_details("admin_verb","SA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 8678e3b6641..6b2224962f5 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -164,7 +164,9 @@ var/list/admin_verbs_debug = list(
/client/proc/map_template_upload,
/client/proc/view_runtimes,
/client/proc/admin_serialize,
- /client/proc/admin_deserialize
+ /client/proc/admin_deserialize,
+ /client/proc/jump_to_ruin,
+ /client/proc/toggle_medal_disable
)
var/list/admin_verbs_possess = list(
/proc/possess,
diff --git a/code/modules/admin/buildmode.dm b/code/modules/admin/buildmode.dm
index 3acc106b907..32bdfa135b5 100644
--- a/code/modules/admin/buildmode.dm
+++ b/code/modules/admin/buildmode.dm
@@ -447,7 +447,7 @@
new/obj/machinery/door/airlock(get_turf(object))
else if(istype(object,/turf) && ctrl_click && left_click)
var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
- WIN.set_dir(build_dir)
+ WIN.setDir(build_dir)
log_admin("Build Mode: [key_name(user)] built a window at ([object.x],[object.y],[object.z])")
if(ADV_BUILDMODE)
@@ -458,7 +458,7 @@
T.ChangeTurf(objholder)
else
var/obj/A = new objholder (get_turf(object))
- A.set_dir(build_dir)
+ A.setDir(build_dir)
log_admin("Build Mode: [key_name(user)] modified [A]'s ([A.x],[A.y],[A.z]) dir to [build_dir]")
else if(right_click)
if(isobj(object))
@@ -547,7 +547,7 @@
T.ChangeTurf(objholder)
else
var/obj/A = new objholder(T)
- A.set_dir(build_dir)
+ A.setDir(build_dir)
deselect_region()
return
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index 506fb527699..8e98e238fee 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -427,7 +427,7 @@
else
dat += "| Nuclear Operative not found! |
"
dat += "
| Nuclear Disk(s) |
"
- for(var/obj/item/weapon/disk/nuclear/N in world)
+ for(var/obj/item/weapon/disk/nuclear/N in poi_list)
dat += "| [N.name], "
var/atom/disk_loc = N.loc
while(!istype(disk_loc, /turf))
@@ -531,6 +531,13 @@
if(ticker.mode.greyshirts.len)
dat += check_role_table("Greyshirts", ticker.mode.greyshirts)
+ if(ts_spiderlist.len)
+ var/list/spider_minds = list()
+ for(var/mob/living/simple_animal/hostile/poison/terror_spider/S in ts_spiderlist)
+ if(S.ckey)
+ spider_minds += S.mind
+ dat += check_role_table("Terror Spiders", spider_minds)
+
dat += " |