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

Merge pull request #11712 from Ghommie/Ghommie-cit661

Browse Source 
Porting the mutation conflict system, and resizing quantum realm fix.
This commit is contained in:
kevinz000
2020-04-03 21:58:58 -07:00
committed by GitHub
parent 010ddb2bfb 519ebd5ed8
commit 1987cc56a2
4 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/reagents/chemistry/reagents/drink_reagents.dm
View File

@@ -864,12 +864,13 @@
glass_icon_state = "red_queen"
glass_name = "Red Queen"
glass_desc = "DRINK ME."
var/current_size = 1
var/current_size = RESIZE_DEFAULT_SIZE
/datum/reagent/consumable/red_queen/on_mob_life(mob/living/carbon/H)
if(prob(75))
return ..()
var/newsize = pick(0.5, 0.75, 1, 1.50, 2)
newsize *= RESIZE_DEFAULT_SIZE
H.resize = newsize/current_size
current_size = newsize
H.update_transform()
@@ -878,7 +879,8 @@
..()
/datum/reagent/consumable/red_queen/on_mob_end_metabolize(mob/living/M)
M.resize = 1/current_size
M.resize = RESIZE_DEFAULT_SIZE/current_size
current_size = RESIZE_DEFAULT_SIZE
M.update_transform()
..()

15
code/modules/reagents/chemistry/reagents/other_reagents.dm
View File

@@ -1917,22 +1917,22 @@
name = "Growth Serum"
description = "A commercial chemical designed to help older men in the bedroom."//not really it just makes you a giant
color = "#ff0000"//strong red. rgb 255, 0, 0
var/current_size = 1
var/current_size = RESIZE_DEFAULT_SIZE
taste_description = "bitterness" // apparently what viagra tastes like
/datum/reagent/growthserum/on_mob_life(mob/living/carbon/H)
var/newsize = current_size
switch(volume)
if(0 to 19)
newsize = 1.25
newsize = 1.25*RESIZE_DEFAULT_SIZE
if(20 to 49)
newsize = 1.5
newsize = 1.5*RESIZE_DEFAULT_SIZE
if(50 to 99)
newsize = 2
newsize = 2*RESIZE_DEFAULT_SIZE
if(100 to 199)
newsize = 2.5
newsize = 2.5*RESIZE_DEFAULT_SIZE
if(200 to INFINITY)
newsize = 3.5
newsize = 3.5*RESIZE_DEFAULT_SIZE
H.resize = newsize/current_size
current_size = newsize
@@ -1940,7 +1940,8 @@
..()
/datum/reagent/growthserum/on_mob_end_metabolize(mob/living/M)
M.resize = 1/current_size
M.resize = RESIZE_DEFAULT_SIZE/current_size
current_size = RESIZE_DEFAULT_SIZE
M.update_transform()
..()