cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Electric Boogaloo (Take Two) (#31892)

Browse Source 
* wall and floor and overlay icons

* HOLY SHIT PLANEMASTERS ARE AMAZING <3 LUMMOX

* nevermind shit is fucked i hate byond

* apc hackin tweaks start now

* attack_ai is overridden almost everywhere for zero reason

* more attack_ai shit

* more shit

* FORCEDISABLE pt. 1

* FORCEDISABLE pt 2

* more forcedisable 3

* 3.1

* end of forcedisable

* remove all hackview shit, cleanup

* better apc hacking, lots of fixes, and UI!

* more machine ability, lots of cleanup, radial lock updating, modules and active modules

* movable ui elements

* ADVANCED hologrmas

* more SHIT

* SHUNTSHUNTSHUNT

* fig congflgighgsa

* more testing

* fuck

* commit 2

* holo fixes

* fake APC images!

* lots of stuff

* fixes and cleanup and vomit

* More abilities. AI Control fixes and cleanup

* fixes

* fix

* clear another warning

* remove comment fix numbers

* raise price

* raise price

* fix

* 1 autoborger limit

* remove undocumented change

* handle at bot level

* order of operations

* dont call ert

* decrease

* fix unit test

* icon check please work

* remove unused icons, comment out chem dispenser drain

* comment out firewall, add disable to turrets

* remove unused wall icons

* Sort mob list, humans appear at the top

* fix sorting, fix hologram bug

* hologram tweaks, stupid fucking alert APC name

* qdel

* raise ever so slightly

* revert

* Delete broken_hand_icons.txt

* Update setup.dm

* Create setup.dm

* attack_self

* fix filter icon, delete unused file, remove forcedisable from magtape deck

* accidental change

* mousedropfrom recharge station

* oh rite

* fixo

* remove useless code

* aaahhh

* remove rig meal, made obsolete by emag

* fffffshhhhhhwooooop

* typo!
This commit is contained in:
gurfan
2022-01-31 18:18:06 -06:00
committed by GitHub
parent 11953788f0
commit 12b68b9546
293 changed files with 3436 additions and 1846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/modules/recycling/compactor.dm
View File

@@ -7,10 +7,14 @@
req_access = list(access_janitor)
template_path = "disposalsbincompactor.tmpl"
hack_abilities = list(
/datum/malfhack_ability/toggle/disable,
/datum/malfhack_ability/oneuse/overload_quiet,
/datum/malfhack_ability/oneuse/emag
)
/obj/machinery/disposal/compactor/proc/compact()
if(stat & NOPOWER)
return
if(stat & BROKEN)
if(stat & (FORCEDISABLE|NOPOWER|BROKEN))
return
playsound(src,'sound/machines/compactor.ogg', 30, 1) //Placeholder
flush = 1
@@ -86,7 +90,7 @@
/obj/machinery/disposal/compactor/process()
updateDialog()
update_icon()
if(stat & NOPOWER || stat & BROKEN)
if(stat & (NOPOWER|BROKEN|FORCEDISABLE))
return
if(!anchored)
return
@@ -108,6 +112,11 @@
return
..()
/obj/machinery/disposal/compactor/emag_ai(mob/living/silicon/ai/A)
emagged = 1
to_chat(A, "<span class='notice'>You disable the safety features.</span>")
/obj/machinery/disposal/compactor/Move(NewLoc, Dir = 0, step_x = 0, step_y = 0, glide_size_override = 0)
..()
if(prob(2))

6
code/modules/recycling/conveyor2.dm
View File

@@ -49,7 +49,7 @@
return
else if(!operable)
operating = 0
else if(stat & NOPOWER)
else if(stat & (FORCEDISABLE|NOPOWER))
operating = 0
else
operating = 1
@@ -225,7 +225,7 @@
return
if(!operable)
operating = 0
if(stat & NOPOWER)
if(stat & (FORCEDISABLE|NOPOWER))
operating = 0
var/disp_op = operating
if(in_reverse && disp_op!=0)
@@ -235,7 +235,7 @@
// machine process
// move items to the target location
/obj/machinery/conveyor/process()
if(stat & (BROKEN | NOPOWER))
if(stat & (BROKEN | NOPOWER | FORCEDISABLE))
return
if(!operating)
return

9
code/modules/recycling/disposal.dm
View File

@@ -215,11 +215,6 @@
update_icon()
return
// ai as human but can't flush
/obj/machinery/disposal/attack_ai(mob/user as mob)
src.add_hiddenprint(user)
ui_interact(user)
// human interact with machine
/obj/machinery/disposal/attack_hand(mob/user as mob)
if(user && user.loc == src)
@@ -318,7 +313,7 @@
overlays += image('icons/obj/pipes/disposal.dmi', "dispover-handle")
// only handle is shown if no power
if(stat & NOPOWER || mode == -1)
if(stat & (FORCEDISABLE|NOPOWER) || mode == -1)
return
// check for items in disposal - occupied light
@@ -355,7 +350,7 @@
spawn(0)
flush()
if(stat & NOPOWER) // won't charge if no power
if(stat & (FORCEDISABLE|NOPOWER)) // won't charge if no power
return
use_power(100) // base power usage

9
code/modules/recycling/sortingmachinery.dm
View File

@@ -288,7 +288,7 @@
idle_power_usage = initial(idle_power_usage) - (T * (initial(idle_power_usage) / 4))//25% power usage reduction for an advanced capacitor, 50% for a super one.
/obj/machinery/sorting_machine/process()
if(stat & (BROKEN | NOPOWER))
if(stat & (BROKEN | NOPOWER | FORCEDISABLE))
return
var/turf/in_T = get_step(src, input_dir)
@@ -315,9 +315,6 @@
items_moved++
/obj/machinery/sorting_machine/attack_ai(mob/user)
interact(user)
/obj/machinery/sorting_machine/attack_hand(mob/user)
interact(user)
@@ -474,7 +471,7 @@
return A.w_type && (types[A.w_type] in selected_types)
/obj/machinery/sorting_machine/recycling/interact(mob/user)
if(stat & (BROKEN | NOPOWER))
if(stat & (BROKEN | NOPOWER | FORCEDISABLE))
if(user.machine == src)
usr.unset_machine()
return
@@ -521,7 +518,7 @@
RefreshParts()
/obj/machinery/sorting_machine/destination/interact(mob/user)
if(stat & (BROKEN | NOPOWER))
if(stat & (BROKEN | NOPOWER | FORCEDISABLE))
if(user.machine == src)
usr.unset_machine()
return