cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes all bitflags use bitshifting (#24179)

Browse Source 
* Makes all bitflags use bitshifting

* Update contributing.md

* Updated spacing

* Defunct

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
This commit is contained in:
Adrer
2024-03-10 17:51:42 +00:00
committed by GitHub
co-authored by adrermail@gmail.com <adrermail@gmail.com>
parent e727727f69
commit 01226e123a
22 changed files with 327 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/machinery/portable/canister.dm
+8 -8
View File
@@ -43,14 +43,14 @@
GLOBAL_DATUM_INIT(canister_icon_container, /datum/canister_icons, new())
#define HOLDING_TANK 1
#define CONNECTED_PORT 2
#define LOW_PRESSURE 4
#define NORMAL_PRESSURE 8
#define HIGH_PRESSURE 16
#define EXTREME_PRESSURE 32
#define NEW_COLOR 64
#define RESET 68
#define HOLDING_TANK (1<<0)
#define CONNECTED_PORT (1<<1)
#define LOW_PRESSURE (1<<2)
#define NORMAL_PRESSURE (1<<3)
#define HIGH_PRESSURE (1<<4)
#define EXTREME_PRESSURE (1<<5)
#define NEW_COLOR (1<<6)
#define RESET (LOW_PRESSURE | NEW_COLOR)
/obj/machinery/atmospherics/portable/canister
name = "canister"
code/modules/awaymissions/maploader/writer.dm
+7 -7
View File
@@ -1,10 +1,10 @@
#define DMM_IGNORE_AREAS 1
#define DMM_IGNORE_TURFS 2
#define DMM_IGNORE_OBJS 4
#define DMM_IGNORE_NPCS 8
#define DMM_IGNORE_PLAYERS 16
#define DMM_IGNORE_MOBS 24
#define DMM_USE_JSON 32
#define DMM_IGNORE_AREAS (1<<0)
#define DMM_IGNORE_TURFS (1<<1)
#define DMM_IGNORE_OBJS (1<<2)
#define DMM_IGNORE_NPCS (1<<3)
#define DMM_IGNORE_PLAYERS (1<<4)
#define DMM_IGNORE_MOBS (DMM_IGNORE_NPCS | DMM_IGNORE_PLAYERS)
#define DMM_USE_JSON (1<<5)
/datum/dmm_suite/proc/save_map(turf/t1, turf/t2, map_name = "", flags = 0)
// Check for illegal characters in file name... in a cheap way.
code/modules/power/apc/apc_overlay.dm
+21 -21
View File
@@ -1,31 +1,31 @@
//update_state
#define UPSTATE_CELL_IN 1
#define UPSTATE_OPENED1 2
#define UPSTATE_OPENED2 4
#define UPSTATE_MAINT 8
#define UPSTATE_BROKE 16
#define UPSTATE_BLUESCREEN 32
#define UPSTATE_WIREEXP 64
#define UPSTATE_ALLGOOD 128
#define UPSTATE_CELL_IN (1<<0)
#define UPSTATE_OPENED1 (1<<1)
#define UPSTATE_OPENED2 (1<<2)
#define UPSTATE_MAINT (1<<3)
#define UPSTATE_BROKE (1<<4)
#define UPSTATE_BLUESCREEN (1<<5)
#define UPSTATE_WIREEXP (1<<6)
#define UPSTATE_ALLGOOD (1<<7)
//update_overlay
#define APC_UPOVERLAY_CHARGEING0 1
#define APC_UPOVERLAY_CHARGEING1 2
#define APC_UPOVERLAY_CHARGEING2 4
#define APC_UPOVERLAY_EQUIPMENT0 8
#define APC_UPOVERLAY_EQUIPMENT1 16
#define APC_UPOVERLAY_EQUIPMENT2 32
#define APC_UPOVERLAY_LIGHTING0 64
#define APC_UPOVERLAY_LIGHTING1 128
#define APC_UPOVERLAY_LIGHTING2 256
#define APC_UPOVERLAY_ENVIRON0 512
#define APC_UPOVERLAY_ENVIRON1 1024
#define APC_UPOVERLAY_ENVIRON2 2048
#define APC_UPOVERLAY_LOCKED 4096
#define APC_UPOVERLAY_CHARGEING0 (1<<0)
#define APC_UPOVERLAY_CHARGEING1 (1<<1)
#define APC_UPOVERLAY_CHARGEING2 (1<<2)
#define APC_UPOVERLAY_EQUIPMENT0 (1<<3)
#define APC_UPOVERLAY_EQUIPMENT1 (1<<4)
#define APC_UPOVERLAY_EQUIPMENT2 (1<<5)
#define APC_UPOVERLAY_LIGHTING0 (1<<6)
#define APC_UPOVERLAY_LIGHTING1 (1<<7)
#define APC_UPOVERLAY_LIGHTING2 (1<<8)
#define APC_UPOVERLAY_ENVIRON0 (1<<9)
#define APC_UPOVERLAY_ENVIRON1 (1<<10)
#define APC_UPOVERLAY_ENVIRON2 (1<<11)
#define APC_UPOVERLAY_LOCKED (1<<12)
#define APC_UPDATE_ICON_COOLDOWN 20 SECONDS // 20 seconds