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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Tastyfish
2012-01-25 20:05:16 -05:00
parent 2d639d053b 4139c553ad
commit 07d989bbd7
19 changed files with 8848 additions and 8679 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/chemical/Chemistry-Reagents.dm
+21
View File
@@ -1503,6 +1503,27 @@ datum
..()
return
liquidnitrogen
name = "Liquid Nitrogen"
id = "liquidnitrogen"
description = "Liquid Nitrogen. VERY cold."
reagent_state = LIQUID
color = "#B31008" // rgb: 139, 166, 233
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M:bodytemperature -= 50 //This and the following two lines need to be checked and tinkered with so that the Cryo-In-A-Syringe
if(prob(5)) // leaves someone at 100% healthy from anything up to in heavy crit (-75%)
M.take_organ_damage(0, 1)
if(prob(80) && istype(M, /mob/living/carbon/metroid))
M.adjustFireLoss(rand(5,20))
M << "\red You feel a terrible chill inside your body!"
..()
return
reaction_turf(var/turf/simulated/T, var/volume)
for(var/mob/living/carbon/metroid/M in T)
M.adjustToxLoss(rand(15,30))
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
code/modules/chemical/Chemistry-Tools.dm
+58 -1
View File
@@ -1262,6 +1262,12 @@
user << "\blue [trans] units injected. [reagents.total_volume] units remaining in the hypospray."
return
/obj/item/weapon/reagent_containers/hypospray/ert
name = "emergency hypospray"
desc = "The DeForest Medical Corporation hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients."
amount_per_transfer_from_this = 50
volume = 50
////////////////////////////////////////////////////////////////////////////////
/// Food.
////////////////////////////////////////////////////////////////////////////////
@@ -2175,6 +2181,57 @@
var/list/data = list("viruses"= list(F))
reagents.add_reagent("blood", 20, data)
/obj/item/weapon/reagent_containers/glass/bottle/ert
name = "emergency medicine bottle"
desc = "A large bottle."
icon = 'chemical.dmi'
icon_state = "bottle3"
item_state = "atoxinbottle"
amount_per_transfer_from_this = 50
possible_transfer_amounts = null
flags = FPRINT | TABLEPASS | OPENCONTAINER
volume = 50
New()
..()
if(!icon_state)
icon_state = "bottle[rand(1,20)]"
/obj/item/weapon/reagent_containers/glass/bottle/ert/quikheal
name = "Quikheal bottle"
desc = "Seems to be a strange mix of delicious goodness. Smells woozy."
New()
..()
reagents.add_reagent("bicaridine", 8)
reagents.add_reagent("dexalinp", 5)
reagents.add_reagent("dermaline", 8)
reagents.add_reagent("arithrazine", 8)
reagents.add_reagent("inaprovaline", 8)
reagents.add_reagent("cryptobiolin", 13)
/obj/item/weapon/reagent_containers/glass/bottle/ert/boost
name = "Combat Boost bottle"
desc = "Seems to be a strange mix of delicious goodness. It... Pulses slightly before your eyes."
New()
..()
reagents.add_reagent("hyperzine", 10)
reagents.add_reagent("dermaline", 10)
reagents.add_reagent("leporazine", 10)
reagents.add_reagent("bicaridine", 10)
reagents.add_reagent("mutagen", 10)
/obj/item/weapon/reagent_containers/glass/bottle/ert/cryo
name = "Cryo-in-a-bottle"
desc = "Seems to be a strange mix of delicious goodness. It's freezing cold to the touch."
New()
..()
reagents.add_reagent("clonexadone", 25)
reagents.add_reagent("liquidnitrogen", 15)
reagents.add_reagent("chloralhydrate", 10)
/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone
name = "beaker"
@@ -2823,7 +2880,7 @@
icon_state = "pill5"
New()
..()
reagents.add_reagent("toxin", 100)
reagents.add_reagent("chloralhydrate", 100)
/obj/item/weapon/reagent_containers/pill/adminordrazine
name = "Adminordrazine pill"
code/modules/clothing/spacesuits/miscellaneous.dm
+1 -1
View File
@@ -47,4 +47,4 @@
w_class = 3
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
slowdown = 0
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
code/modules/clothing/spacesuits/syndi.dm
+12
View File
@@ -101,23 +101,29 @@
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-blue"
item_state = "syndicate-helm-black-blue"
armor = list(melee = 70, bullet = 70, laser = 60, energy = 30, bomb = 30, bio = 50, rad = 50)
/obj/item/clothing/suit/space/syndicate/black/blue
name = "Black and Blue Space Suit"
icon_state = "syndicate-black-blue"
item_state = "syndicate-black-blue"
armor = list(melee = 70, bullet = 70, laser = 60, energy = 30, bomb = 30, bio = 50, rad = 50)
slowdown = 2
/obj/item/clothing/head/helmet/space/syndicate/black/med
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-med"
item_state = "syndicate-helm-black"
armor = list(melee = 50, bullet = 40, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100)
/obj/item/clothing/suit/space/syndicate/black/med
name = "Green Space Suit"
icon_state = "syndicate-black-med"
item_state = "syndicate-black"
armor = list(melee = 50, bullet = 40, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100)
slowdown = 0
@@ -138,12 +144,15 @@
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-red"
item_state = "syndicate-helm-black-red"
armor = list(melee = 70, bullet = 70, laser = 60, energy = 30, bomb = 30, bio = 30, rad = 30)
/obj/item/clothing/suit/space/syndicate/black/red
name = "Black and Red Space Suit"
icon_state = "syndicate-black-red"
item_state = "syndicate-black-red"
armor = list(melee = 70, bullet = 70, laser = 60, energy = 30, bomb = 30, bio = 30, rad = 30)
slowdown = 4
@@ -151,12 +160,15 @@
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-engie"
item_state = "syndicate-helm-black"
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 50, bio = 30, rad = 100)
/obj/item/clothing/suit/space/syndicate/black/engie
name = "Black Engineering Space Suit"
icon_state = "syndicate-black-engie"
item_state = "syndicate-black"
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 50, bio = 30, rad = 100)
slowdown = 2
code/modules/mob/living/carbon/monkey/life.dm
+1 -1
View File
@@ -418,7 +418,7 @@
else if(src.health < config.health_threshold_crit)
if(src.health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!src.rejuv) src.oxyloss++
if(!src.rejuv) src.oxyloss++
if(!src.reagents.has_reagent("inaprovaline")) src.oxyloss++
if(src.stat != 2) src.stat = 1
code/modules/recycling/sortingmachinery.dm
Regular → Executable
+8 -2
View File
@@ -316,6 +316,7 @@
desc = "A chute for big and small packages alike!"
density = 0
icon_state = "intake"
var/currentlyFlushing = 0
interact()
return
@@ -351,8 +352,13 @@
air_contents = new() // new empty gas resv.
sleep(10)
playsound(src, 'disposalflush.ogg', 50, 0, 0)
sleep(10) // Prevent sound spam when several objects are flushed simultaneously.
if(!currentlyFlushing)
currentlyFlushing = 1
playsound(src, 'disposalflush.ogg', 50, 0, 0)
spawn(17) // Sound file is ~3 seconds long, adjust this if it becomes longer/shorter.
currentlyFlushing = 0
sleep(5) // wait for animation to finish