cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaces lag with lag(lite) (#17319)

Browse Source 
* a couple files

* another quarter basically

* awooga

* so many changes

* comma moment

* oop and a zero

* guggugugug

* Update magic.dm

* e

* Update dcs.dm

* e

* finally

* Update watertank.dm

Fixwatertank

Co-authored-by: Molti <gamingjoelouis@gmail.com>
This commit is contained in:
Manatee
2023-01-11 19:07:38 -06:00
committed by GitHub
parent 9745a92b81
commit 1ba55a0a37
134 changed files with 807 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/research/xenobiology/crossbreeding/_weapons.dm
View File

@@ -87,11 +87,11 @@ Slimecrossing Weapons
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
/obj/item/gun/magic/bloodchill/process()
charge_tick++
if(charge_tick < recharge_rate || charges >= max_charges)
/obj/item/gun/magic/bloodchill/process(delta_time)
charge_timer += delta_time
if(charge_timer < recharge_rate || charges >= max_charges)
return 0
charge_tick = 0
charge_timer = 0
var/mob/living/M = loc
if(istype(M) && M.blood_volume >= 20)
charges++

20
code/modules/research/xenobiology/crossbreeding/recurring.dm
View File

@@ -11,7 +11,7 @@ Recurring extracts:
var/extract_type
var/obj/item/slime_extract/extract
var/cooldown = 0
var/max_cooldown = 5 //In sets of 2 seconds.
var/max_cooldown = 10 //In seconds
/obj/item/slimecross/recurring/Initialize()
. = ..()
@@ -26,9 +26,9 @@ Recurring extracts:
src.forceMove(extract)
START_PROCESSING(SSobj,src)
/obj/item/slimecross/recurring/process()
/obj/item/slimecross/recurring/process(delta_time)
if(cooldown > 0)
cooldown--
cooldown -= delta_time
else if(extract.Uses < 10 && extract.Uses > 0)
extract.Uses++
cooldown = max_cooldown
@@ -61,17 +61,17 @@ Recurring extracts:
/obj/item/slimecross/recurring/metal
extract_type = /obj/item/slime_extract/metal
colour = "metal"
max_cooldown = 10
max_cooldown = 20
/obj/item/slimecross/recurring/yellow
extract_type = /obj/item/slime_extract/yellow
colour = "yellow"
max_cooldown = 10
max_cooldown = 20
/obj/item/slimecross/recurring/darkpurple
extract_type = /obj/item/slime_extract/darkpurple
colour = "dark purple"
max_cooldown = 10
max_cooldown = 20
/obj/item/slimecross/recurring/darkblue
extract_type = /obj/item/slime_extract/darkblue
@@ -88,7 +88,7 @@ Recurring extracts:
/obj/item/slimecross/recurring/sepia
extract_type = /obj/item/slime_extract/sepia
colour = "sepia"
max_cooldown = 18 //No infinite timestop for you!
max_cooldown = 38 //No infinite timestop for you!
/obj/item/slimecross/recurring/cerulean
extract_type = /obj/item/slime_extract/cerulean
@@ -113,7 +113,7 @@ Recurring extracts:
/obj/item/slimecross/recurring/gold
extract_type = /obj/item/slime_extract/gold
colour = "gold"
max_cooldown = 15
max_cooldown = 30
/obj/item/slimecross/recurring/oil
extract_type = /obj/item/slime_extract/oil
@@ -130,9 +130,9 @@ Recurring extracts:
/obj/item/slimecross/recurring/adamantine
extract_type = /obj/item/slime_extract/adamantine
colour = "adamantine"
max_cooldown = 10
max_cooldown = 20
/obj/item/slimecross/recurring/rainbow
extract_type = /obj/item/slime_extract/rainbow
colour = "rainbow"
max_cooldown = 20 //It's pretty powerful.
max_cooldown = 40 //It's pretty powerful.