cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Overhauls borg hypos to work like chem dispensers (#11931)

Browse Source 
Co-authored-by: Ryumi <ghosttehspychecka@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-11-07 09:17:21 -07:00
committed by GitHub
parent e13cfbc71c
commit 38f998779a
31 changed files with 761 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/mecha/equipment/weapons/weapons.dm
View File

@@ -33,12 +33,7 @@
chassis.visible_message(span_warning("[chassis] fires [src]!"))
occupant_message(span_warning("You fire [src]!"))
src.mecha_log_message("Fired from [src], targeting [target].")
var/target_for_log = "unknown"
if(ismob(target))
target_for_log = target
else if(target)
target_for_log = "[target.name]"
add_attack_logs(chassis.occupant,target_for_log,"Fired exosuit weapon [src.name] (MANUAL)")
add_attack_logs(chassis.occupant,target,"Fired exosuit weapon [src.name] (MANUAL)")
for(var/i = 1 to min(projectiles, projectiles_per_shot))
var/turf/aimloc = targloc

12
code/game/objects/items/toys/toy_customizable.dm
View File

@@ -150,16 +150,18 @@
if("import_config")
. = TRUE
var/our_data = params["config"]
var/imported_color = sanitize_hexcolor(our_data["base_color"])
if(imported_color)
base_color = imported_color
set_new_name(our_data["name"])
base_color = sanitize_hexcolor(our_data["base_color"])
var/new_name = sanitize_name(our_data["name"])
if(new_name)
set_new_name(new_name)
added_overlays.Cut()
if(!possible_overlays)
return
for(var/overlay in our_data["overlays"])
if(possible_overlays.Find(overlay["icon_state"]))
added_overlays[overlay["icon_state"]] = list( color = overlay["color"], alpha = overlay["alpha"] )
var/new_color = sanitize_hexcolor(overlay["color"])
var/new_alpha = CLAMP(text2num(overlay["alpha"]), 0, 255)
added_overlays[overlay["icon_state"]] = list(color = new_color, alpha = new_alpha)
update_icon()
if("clear")