cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 08:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-09-24 10:13:01 -04:00
parent ae8d35f963 5fdb6d3618
commit b308ee9d78
313 changed files with 6548 additions and 4624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/rcd/RCD.dm
+5 -10
View File
@@ -165,8 +165,8 @@
//check if we can build our window on the grill
if(target_turf.is_blocked_turf(exclude_mobs = !is_full_tile, source_atom = null, ignore_atoms = structures_to_ignore, type_list = TRUE))
playsound(get_turf(user), SFX_TOOL_SWITCH, 20, TRUE)
balloon_alert(user, "something is blocking the turf")
playsound(user, SFX_TOOL_SWITCH, 20, TRUE)
balloon_alert(user, "tile is blocked!")
return FALSE
/**
@@ -344,7 +344,7 @@
data["selected_root"] = root_category
data["categories"] = list()
for(var/sub_category as anything in GLOB.rcd_designs[root_category])
for(var/sub_category in GLOB.rcd_designs[root_category])
var/list/target_category = GLOB.rcd_designs[root_category][sub_category]
if(!length(target_category))
continue
@@ -529,15 +529,10 @@
/obj/item/construction/rcd/ce
name = "professional RCD"
desc = "A higher-end model of the rapid construction device, prefitted with improved cooling and disruption prevention. Provided to the chief engineer."
icon_state = "cercd"
inhand_icon_state = "cercd"
construction_upgrades = RCD_UPGRADE_ANTI_INTERRUPT | RCD_UPGRADE_NO_FREQUENT_USE_COOLDOWN
matter = 160
color = list(
0.3, 0.3, 0.7, 0.0,
1.0, 1.0, 0.2, 0.0,
-0.2, 0.0, 1.0, 0.0,
0.0, 0.0, 0.0, 1.0,
0.0, 0.0, 0.0, 0.0,
)
/obj/item/construction/rcd/combat
name = "industrial RCD"
code/game/objects/items/rcd/RPLD.dm
+2 -2
View File
@@ -206,13 +206,13 @@
var/is_allowed = TRUE
if(!checkResource(cost, user) || !(is_allowed = canPlace(destination)))
if(!is_allowed)
balloon_alert(user, "turf is blocked!")
balloon_alert(user, "tile is blocked!")
return FALSE
if(!build_delay(user, cost, target = destination))
return FALSE
if(!checkResource(cost, user) || !(is_allowed = canPlace(destination)))
if(!is_allowed)
balloon_alert(user, "turf is blocked!")
balloon_alert(user, "tile is blocked!")
return FALSE
if(!useResource(cost, user))
code/game/objects/items/rcd/RTD.dm
+1 -1
View File
@@ -160,7 +160,7 @@
data["selected_root"] = root_category
data["categories"] = list()
for(var/sub_category as anything in GLOB.floor_designs[root_category])
for(var/sub_category in GLOB.floor_designs[root_category])
var/list/target_category = GLOB.floor_designs[root_category][sub_category]
var/list/designs = list() //initialize all designs under this category