shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-29866

Browse Source
This commit is contained in:
LetterJay
2017-09-06 09:21:53 -05:00
committed by GitHub
parent b6f6970ebb cf46abecb3
commit 00199af27d
545 changed files with 13331 additions and 156744 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+9 -10
View File
@@ -75,9 +75,9 @@
/obj/machinery/chem_dispenser/emag_act(mob/user)
if(emagged)
to_chat(user, "<span class='warning'>\The [src] has no functional safeties to emag.</span>")
to_chat(user, "<span class='warning'>[src] has no functional safeties to emag.</span>")
return
to_chat(user, "<span class='notice'>You short out \the [src]'s safeties.</span>")
to_chat(user, "<span class='notice'>You short out [src]'s safeties.</span>")
dispensable_reagents |= emagged_reagents//add the emagged reagents to the dispensable ones
emagged = TRUE
@@ -182,21 +182,20 @@
var/obj/item/reagent_containers/B = I
. = 1 //no afterattack
if(beaker)
to_chat(user, "<span class='warning'>A container is already loaded into the machine!</span>")
to_chat(user, "<span class='warning'>A container is already loaded into [src]!</span>")
return
if(!user.drop_item()) // Can't let go?
if(!user.transferItemToLoc(B, src))
return
beaker = B
beaker.loc = src
to_chat(user, "<span class='notice'>You add \the [B] to the machine.</span>")
to_chat(user, "<span class='notice'>You add [B] to [src].</span>")
beaker_overlay = beaker_overlay || mutable_appearance(icon, "disp_beaker")
beaker_overlay.pixel_x = rand(-10, 5)//randomize beaker overlay position.
add_overlay(beaker_overlay)
else if(user.a_intent != INTENT_HARM && !istype(I, /obj/item/card/emag))
to_chat(user, "<span class='warning'>You can't load \the [I] into the machine!</span>")
to_chat(user, "<span class='warning'>You can't load [I] into [src]!</span>")
return ..()
else
return ..()
@@ -227,10 +226,10 @@
icon_state = "minidispenser"
powerefficiency = 0.001
amount = 5
recharge_delay = 30
recharge_delay = 20
dispensable_reagents = list()
circuit = /obj/item/circuitboard/machine/chem_dispenser
var/list/dispensable_reagent_tiers = list(
var/static/list/dispensable_reagent_tiers = list(
list(
"hydrogen",
"oxygen",
@@ -282,7 +281,7 @@
time += M.rating
for(var/obj/item/stock_parts/capacitor/C in component_parts)
time += C.rating
recharge_delay /= time/2 //delay between recharges, double the usual time on lowest 50% less than usual on highest
recharge_delay = 30/(time/2) //delay between recharges, double the usual time on lowest 50% less than usual on highest
for(var/obj/item/stock_parts/manipulator/M in component_parts)
for(i=1, i<=M.rating, i++)
dispensable_reagents |= dispensable_reagent_tiers[i]
code/modules/reagents/chemistry/machinery/chem_dispenser.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm (rejected hunks)
@@ -178,7 +178,7 @@
if(default_unfasten_wrench(user, I))
return
- if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER))
+ if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER_1))
var/obj/item/reagent_containers/B = I
. = 1 //no afterattack
if(beaker)
code/modules/reagents/chemistry/machinery/chem_heater.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm (rejected hunks)
@@ -42,7 +42,7 @@
if(default_deconstruction_crowbar(I))
return
- if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER))
+ if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER_1))
. = 1 //no afterattack
if(beaker)
to_chat(user, "<span class='warning'>A beaker is already loaded into the machine!</span>")
code/modules/reagents/chemistry/machinery/chem_master.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm (rejected hunks)
@@ -79,7 +79,7 @@
if(default_unfasten_wrench(user, I))
return
- if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER))
+ if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER_1))
. = 1 // no afterattack
if(panel_open)
to_chat(user, "<span class='warning'>You can't use the [src.name] while its panel is opened!</span>")
code/modules/reagents/chemistry/machinery/pandemic.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm (rejected hunks)
@@ -177,7 +177,7 @@
. = TRUE
/obj/machinery/computer/pandemic/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER))
+ if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER_1))
. = TRUE //no afterattack
if(stat & (NOPOWER|BROKEN))
return
code/modules/reagents/chemistry/machinery/reagentgrinder.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm (rejected hunks)
@@ -116,7 +116,7 @@
if(default_unfasten_wrench(user, I))
return
- if (istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER) )
+ if (istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER_1) )
if (!beaker)
if(!user.drop_item())
return 1
code/modules/reagents/chemistry/reagents/other_reagents.dm
+20
View File
@@ -1086,6 +1086,14 @@
color = "#664B63" // rgb: 102, 75, 99
taste_description = "metal"
/datum/reagent/smart_foaming_agent //Smart foaming agent. Functions similarly to metal foam, but conforms to walls.
name = "Smart foaming agent"
id = "smart_foaming_agent"
description = "A agent that yields metallic foam which conforms to area boundaries when mixed with light metal and a strong acid."
reagent_state = SOLID
color = "#664B63" // rgb: 102, 75, 99
taste_description = "metal"
/datum/reagent/ammonia
name = "Ammonia"
id = "ammonia"
@@ -1565,6 +1573,18 @@
ZI.Insert(H)
..()
/datum/reagent/magillitis
name = "Magillitis"
id = "magillitis"
description = "An experimental serum which causes rapid muscular growth in basic primates. Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas."
reagent_state = LIQUID
color = "#00f041"
/datum/reagent/magillitis/on_mob_life(mob/living/carbon/M)
..()
if(ismonkey(M) && current_cycle >= 10)
return M.gorillize()
/datum/reagent/growthserum
name = "Growth Serum"
id = "growthserum"
code/modules/reagents/chemistry/recipes/others.dm
+21
View File
@@ -466,6 +466,20 @@
s.start()
holder.clear_reagents()
/datum/chemical_reaction/smart_foam
name = "Smart Metal Foam"
id = "smart_metal_foam"
required_reagents = list("aluminium" = 3, "smart_foaming_agent" = 1, "facid" = 1)
mob_react = TRUE
/datum/chemical_reaction/smart_foam/on_reaction(datum/reagents/holder, created_volume)
var/turf/location = get_turf(holder.my_atom)
location.visible_message("<span class='danger'>The solution spews out metallic foam!</span>")
var/datum/effect_system/foam_spread/metal/smart/s = new()
s.set_up(created_volume * 5, location, holder, TRUE)
s.start()
holder.clear_reagents()
/datum/chemical_reaction/ironfoam
name = "Iron Foam"
id = "ironlfoam"
@@ -487,6 +501,13 @@
results = list("foaming_agent" = 1)
required_reagents = list("lithium" = 1, "hydrogen" = 1)
/datum/chemical_reaction/smart_foaming_agent
name = "Smart foaming Agent"
id = "smart_foaming_agent"
results = list("smart_foaming_agent" = 3)
required_reagents = list("foaming_agent" = 3, "acetone" = 1, "iron" = 1)
mix_message = "The solution mixes into a frothy metal foam and conforms to the walls of its container."
/////////////////////////////// Cleaning and hydroponics /////////////////////////////////////////////////