Skip to content
This repository has been archived by the owner on Aug 16, 2023. It is now read-only.

[MIRROR] RCD upgrades now work again #1029

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[MIRROR] RCD upgrades now work again #1029

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbab17c
RCD upgrades now work again (#56931)
TJatPBnJ Feb 16, 2021
8bb6880
RCD upgrades now work again
Feb 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions code/__DEFINES/construction.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
#define CAT_ICE "Frozen"
#define CAT_DRINK "Drinks"

<<<<<<< HEAD
// these aren't even used as bitflags so who even knows why they are treated like them
#define RCD_FLOORWALL (1<<0)
#define RCD_AIRLOCK (1<<1)
Expand All @@ -110,6 +111,19 @@

#define RCD_UPGRADE_FRAMES (1<<0)
#define RCD_UPGRADE_SIMPLE_CIRCUITS (1<<1)
=======
//rcd modes
#define RCD_FLOORWALL 0
#define RCD_AIRLOCK 1
#define RCD_DECONSTRUCT 2
#define RCD_WINDOWGRILLE 3
#define RCD_MACHINE 4
#define RCD_COMPUTER 5
#define RCD_FURNISHING 6

#define RCD_UPGRADE_FRAMES (1<<0)
#define RCD_UPGRADE_SIMPLE_CIRCUITS (1<<1)
>>>>>>> bd5228e... RCD upgrades now work again (#56931)
#define RCD_UPGRADE_SILO_LINK (1<<2)
#define RCD_UPGRADE_FURNISHING (1<<3)

Expand Down