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

bunch of issues (#17900)

Browse Source 
* bunch of issues

* .

* fix those properly

* safety else none at all

* .

* workaround for a byond bug

* .

* invis robot weapons

* light needs to be reset

* .

* use proper datums

* fix sorting here

* only store non vital

* .

* Update organ_external.dm
This commit is contained in:
Kashargul
2025-06-26 08:39:44 +02:00
committed by GitHub
parent 2a47456ae8
commit 55a3daa81d
18 changed files with 60 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reactions/instant/instant.dm
+1 -1
View File
@@ -700,7 +700,7 @@
result_amount = 1
/decl/chemical_reaction/instant/concrete/on_reaction(var/datum/reagents/holder, var/created_volume)
new /obj/item/stack/material/concrete(get_turf(holder.my_atom), created_volume)
new /obj/item/stack/material/concrete(get_turf(holder.my_atom), round(created_volume))
return
/* Grenade reactions */
code/modules/reagents/reagent_containers/pill.dm
+5 -5
View File
@@ -56,14 +56,14 @@
balloon_alert(user, "\the [blocked] is in the way!")
return
balloon_alert_visible("[user] attempts to force [M] to swallow \the [src].")
user.balloon_alert_visible("[user] attempts to force [M] to swallow \the [src].")
user.setClickCooldown(user.get_attack_speed(src))
if(!do_mob(user, M))
return
user.drop_from_inventory(src) //icon update
balloon_alert_visible("[user] forces [M] to swallow \the [src].")
user.balloon_alert_visible("[user] forces [M] to swallow \the [src].")
var/contained = reagentlist()
add_attack_logs(user,M,"Fed a pill containing [contained]")
@@ -83,7 +83,7 @@
if(!target.reagents.total_volume)
balloon_alert(user, "[target] is empty.")
return
balloon_alert_visible("[user] puts something in \the [target]", "[target] dissolves in \the [src]", 2)
user.balloon_alert_visible("[user] puts something in \the [target]", "[target] dissolves in \the [src]", 2)
add_attack_logs(user,null,"Spiked [target.name] with a pill containing [reagentlist()]")
@@ -98,7 +98,7 @@
/obj/item/reagent_containers/pill/attackby(obj/item/W as obj, mob/user as mob)
if(is_sharp(W))
var/obj/item/reagent_containers/powder/J = new /obj/item/reagent_containers/powder(src.loc)
balloon_alert_visible("[user] cuts up [src] with [W]!", "cut up \the [src] with [W]")
user.balloon_alert_visible("[user] cuts up [src] with [W]!", "cut up \the [src] with [W]")
playsound(src.loc, 'sound/effects/chop.ogg', 50, 1)
if(reagents)
@@ -108,7 +108,7 @@
if(istype(W, /obj/item/card/id))
var/obj/item/reagent_containers/powder/J = new /obj/item/reagent_containers/powder(src.loc)
balloon_alert_visible("[user] clumsily cuts up [src] with [W]!", "You clumsily cut up \the [src] with [W]")
user.balloon_alert_visible("[user] clumsily cuts up [src] with [W]!", "You clumsily cut up \the [src] with [W]")
playsound(src.loc, 'sound/effects/chop.ogg', 50, 1)
if(reagents)