diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index baa9d42df5..c18784690c 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -242,7 +242,7 @@ . |= get_hearers_in_view(R.canhear_range, R) -#define SIGN(X) ((X<0)?-1:1) +#define SIGNV(X) ((X<0)?-1:1) /proc/inLineOfSight(X1,Y1,X2,Y2,Z=1,PX1=16.5,PY1=16.5,PX2=16.5,PY2=16.5) var/turf/T @@ -273,7 +273,7 @@ if(T.opacity) return 0 return 1 -#undef SIGN +#undef SIGNV /proc/isInSight(atom/A, atom/B) diff --git a/code/controllers/subsystem/processing/networks.dm b/code/controllers/subsystem/processing/networks.dm index 5c52207e76..0ca5472a6a 100644 --- a/code/controllers/subsystem/processing/networks.dm +++ b/code/controllers/subsystem/processing/networks.dm @@ -42,10 +42,10 @@ PROCESSING_SUBSYSTEM_DEF(networks) /datum/controller/subsystem/processing/networks/proc/make_address(string) if(!string) - return resolve_collisions? make_address("[num2text(rand(HID_RESTRICTED_END, 999999999999), 12)]"):null + return resolve_collisions? make_address("[num2text(rand(HID_RESTRICTED_END, 999999999), 12)]"):null var/hex = md5(string) if(!hex) return //errored . = "[copytext(hex, 1, 9)]" //16 ^ 8 possibilities I think. if(interfaces_by_id[.]) - return resolve_collisions? make_address("[num2text(rand(HID_RESTRICTED_END, 999999999999), 12)]"):null + return resolve_collisions? make_address("[num2text(rand(HID_RESTRICTED_END, 999999999), 12)]"):null diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 6d62ac9e77..90251832bf 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -704,7 +704,7 @@ obj/item/storage/box/clown #define NANOTRASEN "NanotrasenStandard" #define SYNDI "SyndiSnacks" #define HEART "Heart" -#define SMILE "SmileyFace" +#define SMILEY "SmileyFace" /obj/item/storage/box/papersack name = "paper sack" @@ -726,7 +726,7 @@ obj/item/storage/box/clown if(contents.len) to_chat(user, "You can't modify [src] with items still inside!") return - var/list/designs = list(NODESIGN, NANOTRASEN, SYNDI, HEART, SMILE, "Cancel") + var/list/designs = list(NODESIGN, NANOTRASEN, SYNDI, HEART, SMILEY, "Cancel") var/switchDesign = input("Select a Design:", "Paper Sack Design", designs[1]) in designs if(get_dist(usr, src) > 1) to_chat(usr, "You have moved too far away!") @@ -747,7 +747,7 @@ obj/item/storage/box/clown desc = "The design on this paper sack is a remnant of the notorious 'SyndieSnacks' program." if(HEART) desc = "A paper sack with a heart etched onto the side." - if(SMILE) + if(SMILEY) desc = "A paper sack with a crude smile etched onto the side." return 0 else if(W.is_sharp()) @@ -768,7 +768,7 @@ obj/item/storage/box/clown #undef NANOTRASEN #undef SYNDI #undef HEART -#undef SMILE +#undef SMILEY /obj/item/storage/box/ingredients //This box is for the randomely chosen version the chef spawns with, it shouldn't actually exist. name = "ingredients box"