[MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162)

* Ports Rapid Cable Layers from /vg/ and paradise * rej clean up + manual sync * maps and .rej file cleanup * sprite and WGW memes * actual spellchecked memes * some other map fix memes * fuck it, let's just hard sync maps * dumb paperwork shit for maps * Revert "dumb paperwork shit for maps" This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d. * *autistic screeching* * REEEEEEEEEEEEEEEEEEEEE * Fuck off I want to do something else
2017-08-02 04:56:44 -05:00
parent 76f7fcef9a
commit 8a4ddbe8a8
74 changed files with 62713 additions and 61428 deletions
@@ -1,9 +0,0 @@
-diff a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm	(rejected hunks)
-@@ -114,4 +114,6 @@
- #define EASYLIMBATTACHMENT 23
- #define TOXINLOVER		24
- #define DIGITIGRADE		25	//Uses weird leg sprites. Optional for Lizards, required for ashwalkers. Don't give it to other races unless you make sprites for this (see human_parts_greyscale.dmi)
-#define NO_UNDERWEAR		26
-+#define NO_UNDERWEAR	26
-+#define NOLIVER			27
-+#define NOSTOMACH		28
@@ -1,9 +0,0 @@
-diff a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm	(rejected hunks)
-@@ -9,6 +9,7 @@
- #define OXY			"oxy"
- #define CLONE		"clone"
- #define STAMINA 	"stamina"
-+#define BRAIN		"brain"
- 
- //bitflag damage defines used for suicide_act
- #define BRUTELOSS 1
@@ -1,51 +0,0 @@
-diff a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm	(rejected hunks)
-@@ -5,42 +5,15 @@
- #define CHANNEL_JUKEBOX 1021
- #define CHANNEL_JUSTICAR_ARK 1020
- #define CHANNEL_HEARTBEAT 1019 //sound channel for heartbeats
-+#define CHANNEL_AMBIENCE 1018
-+#define CHANNEL_BUZZ 1017
-+#define CHANNEL_BICYCLE 1016
- 
- //THIS SHOULD ALWAYS BE THE LOWEST ONE!
- //KEEP IT UPDATED
- 
-#define CHANNEL_HIGHEST_AVAILABLE 1018
-+#define CHANNEL_HIGHEST_AVAILABLE 1015
- 
- 
- #define SOUND_MINIMUM_PRESSURE 10
-#define FALLOFF_SOUNDS 0.5
-
-//BYOND Sound Environment defines
-
-#define SOUND_ENV_DEFAULT			-1
-#define SOUND_ENV_GENERIC			0
-#define SOUND_ENV_PADDED_CELL		1
-#define SOUND_ENV_ROOM				2
-#define SOUND_ENV_BATHROOM			3
-#define SOUND_ENV_LIVINGROOM		4
-#define SOUND_ENV_STONEROOM			5
-#define SOUND_ENV_AUDITORIUM		6
-#define SOUND_ENV_CONCERT_HALL		7
-#define SOUND_ENV_CAVE				8
-#define SOUND_ENV_ARENA				9
-#define SOUND_ENV_HANGAR			10
-#define SOUND_ENV_CARPETTED_HALLWAY	11
-#define SOUND_ENV_HALLWAY			12
-#define SOUND_ENV_STONE_CORRIDOOR	13
-#define SOUND_ENV_ALLEY				14
-#define SOUND_ENV_FOREST			15
-#define SOUND_ENV_CITY				16
-#define SOUND_ENV_MOUNTAINS			17
-#define SOUND_ENV_QUARRY			18
-#define SOUND_ENV_PLAIN				19
-#define SOUND_ENV_PARKING_LOT		20
-#define SOUND_ENV_SEWER_PIPE		21
-#define SOUND_ENV_UNDERWATER		22
-#define SOUND_ENV_DRUGGED			23
-#define SOUND_ENV_DIZZY				24
-#define SOUND_ENV_PSYCHOTIC			25
-\ No newline at end of file
-+#define FALLOFF_SOUNDS 0.5
-\ No newline at end of file