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

Beepsky refactor and Bot code improvement (#62510)

Browse Source
This commit is contained in:
John Willard
2021-11-08 01:35:54 -08:00
committed by GitHub
parent bf960b1c83
commit b39ccd408e
35 changed files with 471 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/buckling.dm
+3 -3
View File
@@ -26,11 +26,11 @@
if(user_unbuckle_mob(buckled_mobs[1],user))
return TRUE
/atom/movable/attackby(obj/item/W, mob/user, params)
if(!can_buckle || !istype(W, /obj/item/riding_offhand) || !user.Adjacent(src))
/atom/movable/attackby(obj/item/attacking_item, mob/user, params)
if(!can_buckle || !istype(attacking_item, /obj/item/riding_offhand) || !user.Adjacent(src))
return ..()
var/obj/item/riding_offhand/riding_item = W
var/obj/item/riding_offhand/riding_item = attacking_item
var/mob/living/carried_mob = riding_item.rider
if(carried_mob == user) //Piggyback user.
return
code/game/objects/items/devices/PDA/cart.dm
+5 -5
View File
@@ -14,7 +14,7 @@
var/remote_door_id = ""
var/bot_access_flags = 0 //Bit flags. Selection: SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT | FIRE_BOT | VIBE_BOT
var/bot_access_flags = 0 //Bit flags. Selection: SEC_BOT | ADVANCED_SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT | FIRE_BOT | VIBE_BOT
var/spam_enabled = 0 //Enables "Send to All" Option
var/obj/item/pda/host_pda = null
@@ -66,13 +66,13 @@
name = "\improper R.O.B.U.S.T. cartridge"
icon_state = "cart-s"
access = CART_SECURITY | CART_MANIFEST
bot_access_flags = SEC_BOT
bot_access_flags = SEC_BOT | ADVANCED_SEC_BOT
/obj/item/cartridge/detective
name = "\improper D.E.T.E.C.T. cartridge"
icon_state = "cart-s"
access = CART_SECURITY | CART_MEDICAL | CART_MANIFEST
bot_access_flags = SEC_BOT
bot_access_flags = SEC_BOT | ADVANCED_SEC_BOT
/obj/item/cartridge/janitor
name = "\improper CustodiPRO cartridge"
@@ -136,7 +136,7 @@
name = "\improper R.O.B.U.S.T. DELUXE cartridge"
icon_state = "cart-hos"
access = CART_MANIFEST | CART_STATUS_DISPLAY | CART_SECURITY
bot_access_flags = SEC_BOT
bot_access_flags = SEC_BOT | ADVANCED_SEC_BOT
/obj/item/cartridge/ce
@@ -166,7 +166,7 @@
desc = "Now with 350% more value!" //Give the Captain...EVERYTHING! (Except Mime, Clown, and Syndie)
icon_state = "cart-c"
access = ~(CART_CLOWN | CART_MIME | CART_REMOTE_DOOR)
bot_access_flags = SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT | FIRE_BOT | VIBE_BOT
bot_access_flags = SEC_BOT | ADVANCED_SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT | FIRE_BOT | VIBE_BOT
spam_enabled = 1
/obj/item/cartridge/captain/Initialize(mapload)
code/game/objects/items/robot/robot_parts.dm
+2 -2
View File
@@ -279,7 +279,7 @@
lawsync = FALSE
O.set_connected_ai(null)
else
O.notify_ai(NEW_BORG)
O.notify_ai(AI_NOTIFICATION_NEW_BORG)
if(forced_ai)
O.set_connected_ai(forced_ai)
if(!lawsync)
@@ -337,7 +337,7 @@
else
if(forced_ai)
O.set_connected_ai(forced_ai)
O.notify_ai(AI_SHELL)
O.notify_ai(AI_NOTIFICATION_AI_SHELL)
if(!lawsync)
O.lawupdate = FALSE
O.make_laws()
code/game/objects/items/robot/robot_upgrades.dm
+2 -2
View File
@@ -51,7 +51,7 @@
R.custom_name = heldname
R.updatename()
if(oldname == R.real_name)
R.notify_ai(RENAME, oldname, R.real_name)
R.notify_ai(AI_NOTIFICATION_CYBORG_RENAMED, oldname, R.real_name)
log_game("[key_name(user)] have used a cyborg reclassification board to rename [oldkeyname] to [key_name(R)] at [loc_name(user)]")
/obj/item/borg/upgrade/disablercooler
@@ -543,7 +543,7 @@
if (.)
if(R.shell)
R.undeploy()
R.notify_ai(DISCONNECT)
R.notify_ai(AI_NOTIFICATION_AI_SHELL)
/obj/item/borg/upgrade/expand
name = "borg expander"