Merge pull request #15180 from LetterN/achives-

Achivement & Clowncar update

code/__DEFINES/achievements.dm

@@ -32,6 +32,9 @@
 #define MEDAL_VOID_ASCENSION "Void"
 #define MEDAL_TOOLBOX_SOUL "Toolsoul"
 #define MEDAL_CHEM_TUT          "Beginner Chemist"
+#define MEDAL_HOT_DAMN "Hot Damn!"
+#define MEDAL_CAYENNE_DISK "Very Important Piscis"
+#define MEDAL_TRAM_SURFER "Tram Surfer"
 
 //Skill medal hub IDs
 #define MEDAL_LEGENDARY_MINER "Legendary Miner"
@@ -106,3 +109,19 @@
 
 // DB ID for amount of consumed maintenance pills
 #define MAINTENANCE_PILL_SCORE "Maintenance Pill Score"
+
+// DB ID for intento score
+#define INTENTO_SCORE "Intento Score"
+
+// Tourist related achievements and scores
+
+//centcom grades (achievement)
+
+#define MEDAL_BAD_SERVICE "Bad Service"
+#define MEDAL_OKAY_SERVICE "Okay Service"
+#define MEDAL_GOOD_SERVICE "Good Service"
+
+//scores
+
+#define CHEF_TOURISTS_SERVED "Tourists Served As Chef"
+#define BARTENDER_TOURISTS_SERVED "Tourists Served As Bartender"

code/__DEFINES/colors.dm

@@ -59,3 +59,4 @@
 #define COLOR_SILVER					"#C0C0C0"
 #define COLOR_GRAY						"#808080"
 #define COLOR_HALF_TRANSPARENT_BLACK    "#0000007A"
+#define COLOR_BRIGHT_BLUE "#2CB2E8"

code/__DEFINES/cooldowns.dm

@@ -28,6 +28,11 @@
 //INDEXES
 #define COOLDOWN_EMPLOYMENT_CABINET	"employment cabinet"
 
+//car cooldowns
+#define COOLDOWN_CAR_HONK "car_honk"
+
+//clown car cooldowns
+#define COOLDOWN_CLOWNCAR_RANDOMNESS "clown_car_randomness"
 
 //TIMER COOLDOWN MACROS
 

code/__DEFINES/vehicles.dm

@@ -1,9 +1,20 @@
-//Vehicle control flags
+//Vehicle control flags. control flags describe access to actions in a vehicle.
 
-#define VEHICLE_CONTROL_PERMISSION 1
-#define VEHICLE_CONTROL_DRIVE 2
-#define VEHICLE_CONTROL_KIDNAPPED 4 //Can't leave vehicle voluntarily, has to resist.
+///controls the vehicles movement
+#define VEHICLE_CONTROL_DRIVE (1<<0)
+///Can't leave vehicle voluntarily, has to resist.
+#define VEHICLE_CONTROL_KIDNAPPED (1<<1)
+///melee attacks/shoves a vehicle may have
+#define VEHICLE_CONTROL_MELEE (1<<2)
+///using equipment/weapons on the vehicle
+#define VEHICLE_CONTROL_EQUIPMENT (1<<3)
+///changing around settings and the like.
+#define VEHICLE_CONTROL_SETTINGS (1<<4)
 
+//car_traits flags
+///Will this car kidnap people by ramming into them?
+#define CAN_KIDNAP (1<<0)
 
-//Car trait flags
-#define CAN_KIDNAP 1
+#define CLOWN_CANNON_INACTIVE 0
+#define CLOWN_CANNON_BUSY 1
+#define CLOWN_CANNON_READY 2