cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-19 01:57:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Aurorablade
2018-09-06 21:46:19 -04:00
parent 1c74887124 eee57a2b46
commit 6d4d4ba8a4
158 changed files with 2087 additions and 2121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/chem_master.dm
+3
View File
@@ -202,6 +202,9 @@
return
name = reject_bad_text(name)
while(count--)
if(reagents.total_volume <= 0)
to_chat(usr, "<span class='notice'>Not enough reagents to create these pills!</span>")
return
var/obj/item/reagent_containers/food/pill/P = new/obj/item/reagent_containers/food/pill(loc)
if(!name) name = reagents.get_master_reagent_name()
P.name = "[name] pill"
code/modules/reagents/chemistry/reagents/drugs.dm
+4 -4
View File
@@ -302,13 +302,13 @@
M.AdjustWeakened(-2.5)
M.adjustStaminaLoss(-2)
M.SetSleeping(0)
M.status_flags |= GOTTAGOREALLYFAST
M.status_flags |= GOTTAGOFAST_METH
if(prob(50))
M.adjustBrainLoss(1.0)
..()
/datum/reagent/methamphetamine/on_mob_delete(mob/living/M)
M.status_flags &= ~GOTTAGOREALLYFAST
M.status_flags &= ~GOTTAGOFAST_METH
..()
/datum/reagent/methamphetamine/overdose_process(mob/living/M, severity)
@@ -590,7 +590,7 @@
M.AdjustStunned(-2)
M.AdjustWeakened(-2)
M.adjustStaminaLoss(-2)
M.status_flags |= GOTTAGOREALLYFAST
M.status_flags |= GOTTAGOFAST_METH
M.Jitter(3)
M.adjustBrainLoss(0.5)
if(prob(5))
@@ -598,7 +598,7 @@
..()
/datum/reagent/lube/ultra/on_mob_delete(mob/living/M)
M.status_flags &= ~GOTTAGOREALLYFAST
M.status_flags &= ~GOTTAGOFAST_METH
..()
/datum/reagent/lube/ultra/overdose_process(mob/living/M, severity)
code/modules/reagents/reagent_containers/hypospray.dm
+6 -3
View File
@@ -69,10 +69,13 @@
/obj/item/reagent_containers/hypospray/safety
name = "medical hypospray"
desc = "A modified hypospray for quickly injecting safe medicinal chemicals."
icon_state = "combat_hypo"
desc = "A general use medical hypospray for quick injection of chemicals. There is a safety button by the trigger."
icon_state = "medivend_hypo"
safety_hypo = TRUE
/obj/item/reagent_containers/hypospray/safety/ert
list_reagents = list("omnizine" = 30)
/obj/item/reagent_containers/hypospray/CMO
list_reagents = list("omnizine" = 30)
@@ -158,4 +161,4 @@
/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium/attack(mob/living/M, mob/user)
if(..())
playsound(loc, 'sound/weapons/smg_empty_alarm.ogg', 20, 1)
playsound(loc, 'sound/weapons/smg_empty_alarm.ogg', 20, 1)