cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Browse Source
This commit is contained in:
FalseIncarnate
2015-06-23 04:18:46 -04:00
parent acf1e268f1 4d9baf9936
commit fc6ebc4854
230 changed files with 962 additions and 1032 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Holder.dm
+3 -1
View File
@@ -633,4 +633,6 @@ atom/proc/create_reagents(var/max_vol)
reagent.Destroy()
if(my_atom)
my_atom = null
my_atom = null
return ..()
code/modules/reagents/Chemistry-Machinery.dm
-8
View File
@@ -97,10 +97,6 @@
if (prob(50))
del(src)
/obj/machinery/chem_dispenser/meteorhit()
del(src)
return
/**
* The ui_interact proc is used to open and update Nano UIs
* If ui_interact is not used then the UI will not update correctly
@@ -401,10 +397,6 @@
if (prob(50))
qdel(src)
/obj/machinery/chem_master/meteorhit()
qdel(src)
return
/obj/machinery/chem_master/power_change()
if(powered())
stat &= ~NOPOWER
code/modules/reagents/Chemistry-Reagents.dm
+2
View File
@@ -3228,3 +3228,5 @@ datum
if(holder)
holder.reagent_list -= src
holder = null
return ..()
code/modules/reagents/newchem/medicine.dm
+1 -1
View File
@@ -560,7 +560,7 @@ datum/reagent/atropine/on_mob_life(var/mob/living/M as mob)
M.losebreath = 5
if(M.confused > 60)
M.confused += 5
M.reagents.remove_reagent("sarin",10)
M.reagents.remove_reagent("tabun",10)
..()
return
code/modules/reagents/newchem/toxins.dm
+10 -10
View File
@@ -503,25 +503,25 @@ datum/reagent/curare/on_mob_life(var/mob/living/M as mob)
..()
return
datum/reagent/sarin
name = "Sarin"
id = "sarin"
datum/reagent/tabun
name = "Tabun"
id = "tabun"
description = "An extremely deadly neurotoxin."
reagent_state = LIQUID
color = "#C7C7C7"
metabolization_rate = 0.1
penetrates_skin = 1
/datum/chemical_reaction/sarin
name = "sarin"
id = "sarin"
result = "sarin"
required_reagents = list("chlorine" = 1, "fluorine" = 1, "hydrogen" = 1, "oxygen" = 1, "phosphorus" = 1, "fuel" = 1, "acetone" = 1, "atrazine" = 1)
result_amount = 3
/datum/chemical_reaction/tabun
name = "tabun"
id = "tabun"
result = "tabun"
required_reagents = list("phenol" = 1, "diethylamine" = 1, "phosphorus" = 1, "oxygen" = 1, "chlorine" = 1, "sodiumchloride" = 1, "ethanol" = 1, "cyanide" = 1)
result_amount = 8
mix_message = "The mixture yields a colorless, odorless liquid."
required_temp = 374
datum/reagent/sarin/on_mob_life(var/mob/living/M as mob)
datum/reagent/tabun/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M.adjustFireLoss(1)
if(prob(20))
code/modules/reagents/reagent_containers.dm
+1 -1
View File
@@ -29,7 +29,7 @@
/obj/item/weapon/reagent_containers/Destroy()
processing_objects.Remove(src)
..()
return ..()
/obj/item/weapon/reagent_containers/process()
if(reagents)
code/modules/reagents/reagent_containers/borghydro.dm
+1 -1
View File
@@ -33,7 +33,7 @@
/obj/item/weapon/reagent_containers/borghypo/Destroy()
processing_objects.Remove(src)
..()
return ..()
/obj/item/weapon/reagent_containers/borghypo/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg
charge_tick++
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+1 -1
View File
@@ -18,7 +18,7 @@
var/obj/item/weapon/broken_bottle/B = new /obj/item/weapon/broken_bottle(user.loc)
user.put_in_active_hand(B)
if(prob(33))
getFromPool(/obj/item/weapon/shard, target.loc) // Create a glass shard at the target's location!
PoolOrNew(/obj/item/weapon/shard, target.loc) // Create a glass shard at the target's location!
B.icon_state = src.icon_state
var/icon/I = new('icons/obj/drinks.dmi', src.icon_state)
code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+1 -1
View File
@@ -12,7 +12,7 @@
proc/smash(mob/living/target as mob, mob/living/user as mob)
//Creates a shattering noise and replaces the drinking glass with a glass shard
user.drop_item()
var/obj/item/weapon/shard/S = getFromPool(/obj/item/weapon/shard, user.loc)
var/obj/item/weapon/shard/S = PoolOrNew(/obj/item/weapon/shard, user.loc)
user.put_in_active_hand(S)
playsound(src, "shatter", 70, 1)
code/modules/reagents/reagent_containers/food/sandwich.dm
+1 -1
View File
@@ -78,7 +78,7 @@
/obj/item/weapon/reagent_containers/food/snacks/csandwich/Destroy()
for(var/obj/item/O in ingredients)
del(O)
..()
return ..()
/obj/item/weapon/reagent_containers/food/snacks/csandwich/examine()
..()
code/modules/reagents/reagent_containers/food/snacks.dm
+1 -1
View File
@@ -235,7 +235,7 @@
if(contents)
for(var/atom/movable/something in contents)
something.loc = get_turf(src)
..()
return ..()
/obj/item/weapon/reagent_containers/food/snacks/attack_animal(mob/M)
if(isanimal(M))
code/modules/reagents/reagent_containers/food/snacks/grown.dm
+2 -2
View File
@@ -186,7 +186,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/glowberries/Destroy()
if(istype(loc,/mob))
loc.set_light(round(loc.luminosity - potency/5,1))
..()
return ..()
/obj/item/weapon/reagent_containers/food/snacks/grown/glowberries/pickup(mob/user)
src.set_light(0)
@@ -614,7 +614,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/Destroy()
if(istype(loc,/mob))
loc.set_light(round(loc.luminosity - potency/10,1))
..()
return ..()
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/pickup(mob/user)
set_light(0)
code/modules/reagents/reagent_containers/glass/bottle.dm
+1 -1
View File
@@ -275,4 +275,4 @@
New()
..()
reagents.add_reagent(pick("polonium","initropidril","concentrated_initro","pancuronium","sodium_thiopental","ketamine","sulfonal","amanitin","coniine","curare","sarin","histamine","venom","cyanide"), 40)
reagents.add_reagent(pick("polonium","initropidril","concentrated_initro","pancuronium","sodium_thiopental","ketamine","sulfonal","amanitin","coniine","curare","tabun","histamine","venom","cyanide"), 40)
code/modules/reagents/reagent_dispenser.dm
+6 -7
View File
@@ -103,7 +103,7 @@
explode()
blob_act()
explode()
explosion(src.loc,0,1,5,7,10, flame_range = 5)
ex_act()
explode()
@@ -150,14 +150,13 @@
return ..()
/obj/structure/reagent_dispensers/fueltank/proc/explode()
explosion(src.loc,0,1,4)
explosion(src.loc,-1,0,2, flame_range = 2)
if(src)
del(src)
qdel(src)
/obj/structure/reagent_dispensers/fueltank/fire_act(datum/gas_mixture/air, temperature, volume)
if(temperature > T0C+500)
explode()
return ..()
blob_act() //saving a few lines of copypasta
/obj/structure/reagent_dispensers/fueltank/Move()
..()
@@ -219,7 +218,7 @@
/obj/structure/reagent_dispensers/beerkeg/blob_act()
explosion(src.loc,0,3,5,7,10)
del(src)
qdel(src)
/obj/structure/reagent_dispensers/virusfood
name = "Virus Food Dispenser"