mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-24 04:28:12 +01:00
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts: code/game/antagonist/station/rogue_ai.dm code/game/machinery/atmoalter/portable_atmospherics.dm code/game/machinery/spaceheater.dm code/modules/clothing/head/soft_caps.dm maps/exodus-5.dmm
This commit is contained in:
@@ -153,6 +153,13 @@
|
||||
add_admin_verbs()
|
||||
admin_memo_show()
|
||||
|
||||
// Forcibly enable hardware-accelerated graphics, as we need them for the lighting overlays.
|
||||
// (but turn them off first, since sometimes BYOND doesn't turn them on properly otherwise)
|
||||
spawn(5) // And wait a half-second, since it sounds like you can do this too fast.
|
||||
if(src)
|
||||
winset(src, null, "command=\".configure graphics-hwmode off\"")
|
||||
winset(src, null, "command=\".configure graphics-hwmode on\"")
|
||||
|
||||
log_client_to_db()
|
||||
|
||||
send_resources()
|
||||
|
||||
@@ -279,7 +279,7 @@ var/global/list/gear_datums = list()
|
||||
|
||||
/datum/gear/scanning_goggles
|
||||
display_name = "scanning goggles"
|
||||
path = /obj/item/clothing/glasses/science/scanners
|
||||
path = /obj/item/clothing/glasses/regular/scanners
|
||||
cost = 1
|
||||
slot = slot_glasses
|
||||
|
||||
|
||||
Reference in New Issue
Block a user