diff --git a/code/WorkInProgress/Ported/policetape.dm b/code/WorkInProgress/Ported/policetape.dm index 43a41c5a937..f5d17f81378 100644 --- a/code/WorkInProgress/Ported/policetape.dm +++ b/code/WorkInProgress/Ported/policetape.dm @@ -95,7 +95,7 @@ //is_blocked_turf(var/turf/T) usr << "\blue You finish placing the [src]." //Git Test -/obj/item/taperoll/police/afterattack(var/atom/A, mob/user as mob) +/obj/item/taperoll/afterattack(var/atom/A, mob/user as mob) if (istype(A, /obj/machinery/door/airlock)) var/turf/T = get_turf(A) var/obj/item/tape/P = new tape_type(T.x,T.y,T.z) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index a06678a92da..dd15f580636 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -39,7 +39,8 @@ var/global/datum/controller/gameticker/ticker /datum/controller/gameticker/proc/pregame() login_music = pick(\ 'sound/music/space.ogg',\ - 'sound/music/traitor.ogg') + 'sound/music/traitor.ogg',\ + 'sound/music/space_oddity.ogg') //Ground Control to Major Tom, this song is cool, what's going on? do pregame_timeleft = 180 world << "Welcome to the pre-game lobby!" diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 5fdfc357490..d43f7657f2c 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -18,14 +18,6 @@ use_power = 0 var/release_log = "" -/obj/machinery/portable_atmospherics/initialize() - . = ..() - spawn() - var/obj/machinery/atmospherics/portables_connector/connector = locate() in loc - if(connector) - connected_port = connector - update_icon() - /obj/machinery/portable_atmospherics/canister/sleeping_agent name = "Canister: \[N2O\]" icon_state = "redws" diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 939e1c94f32..d29b1f065c0 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -129,5 +129,5 @@ if (!target) src.target = loc -/obj/machinery/meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - return \ No newline at end of file +/obj/machinery/meter/turf/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) + return diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index f929cc0d5eb..dbfd5b62e6a 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -19,6 +19,14 @@ return 1 + initialize() + . = ..() + spawn() + var/obj/machinery/atmospherics/portables_connector/port = locate() in loc + if(port) + connect(port) + update_icon() + process() if(!connected_port) //only react when pipe_network will ont it do it for you //Allow for reactions @@ -135,4 +143,4 @@ user << "\blue Tank is empty!" return - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index fcb00122873..9cc03ebce3b 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -51,7 +51,8 @@ "/obj/item/device/flashlight", "/obj/item/weapon/cable_coil", "/obj/item/device/t_scanner", - "/obj/item/device/analyzer") + "/obj/item/device/analyzer", + "/obj/item/taperoll/engineering") /obj/item/weapon/storage/belt/utility/full/New() diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 1369bb15759..8ea7ff3903d 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -103,7 +103,7 @@ icon = 'icons/obj/chemical.dmi' item_state = "contsolid" w_class = 2.0 - can_hold = list("/obj/item/weapon/reagent_containers/pill","/obj/item/weapon/dice") + can_hold = list("/obj/item/weapon/reagent_containers/pill","/obj/item/weapon/dice","/obj/item/weapon/paper") allow_quick_gather = 1 use_to_pickup = 1 storage_slots = 14 diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm index b917c93752b..0f74d65b7d9 100644 --- a/code/modules/events/meteors.dm +++ b/code/modules/events/meteors.dm @@ -21,7 +21,7 @@ // /datum/event/meteor_shower - startWhen = 6 + startWhen = 5 endWhen = 7 var/next_meteor = 6 var/waves = 1 diff --git a/code/modules/mob/living/carbon/alien/say.dm b/code/modules/mob/living/carbon/alien/say.dm index 37e313dfe38..a791d066524 100644 --- a/code/modules/mob/living/carbon/alien/say.dm +++ b/code/modules/mob/living/carbon/alien/say.dm @@ -9,7 +9,7 @@ return if (length(message) >= 2) - if (copytext(message, 1, 3) == ":a" || copytext(message, 1, 3) == "#a" || copytext(message, 1, 3) == ".a" ) + if (department_radio_keys[copytext(message, 1, 3)] == "alientalk") message = copytext(message, 3) message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) if (stat == 2) diff --git a/code/modules/mob/living/carbon/brain/say.dm b/code/modules/mob/living/carbon/brain/say.dm index 159f899f894..fa09d87f22a 100644 --- a/code/modules/mob/living/carbon/brain/say.dm +++ b/code/modules/mob/living/carbon/brain/say.dm @@ -5,7 +5,7 @@ if(!(container && (istype(container, /obj/item/device/mmi) || istype(container, /obj/item/device/mmi/posibrain)))) return //No MMI, can't speak, bucko./N else - if ((copytext(message, 1, 3) == ":b") || (copytext(message, 1, 3) == ":B") && (container && istype(container, /obj/item/device/mmi/posibrain))) + if ((department_radio_keys[copytext(message, 1, 3)] == "binary") && (container && istype(container, /obj/item/device/mmi/posibrain))) message = copytext(message, 3) message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) robot_talk(message) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 70786c605eb..4a4d6cf0d96 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -7,7 +7,7 @@ if(miming) if(length(message) >= 2) if(mind && mind.changeling) - if(copytext(message, 1, 2) != "*" && copytext(message, 1, 3) != ":g" && copytext(message, 1, 3) != ":G" && copytext(message, 1, 3) != ":ï") + if(copytext(message, 1, 2) != "*" && department_radio_keys[copytext(message, 1, 3)] != "changeling") return else return ..(message) @@ -93,7 +93,7 @@ else if(istype(wear_mask, /obj/item/clothing/mask/horsehead)) var/obj/item/clothing/mask/horsehead/hoers = wear_mask if(hoers.voicechange) - if(!(copytext(message, 1, 2) == "*" || (mind && mind.changeling && (copytext(message, 1, 3) == ":g" || copytext(message, 1, 3) == ":G" || copytext(message, 1, 3) == ":ï")))) + if(!(copytext(message, 1, 2) == "*" || (mind && mind.changeling && department_radio_keys[copytext(message, 1, 3)] != "changeling"))) message = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!") if ((HULK in mutations) && health >= 25 && length(message)) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 816e2a33906..12262202f67 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -54,7 +54,10 @@ var/list/department_radio_keys = list( ":ô" = "alientalk", "#ô" = "alientalk", ".ô" = "alientalk", ":å" = "Syndicate", "#å" = "Syndicate", ".å" = "Syndicate", ":é" = "Supply", "#é" = "Supply", ".é" = "Supply", - ":ï" = "changeling", "#ï" = "changeling", ".ï" = "changeling" + ":ï" = "changeling", "#ï" = "changeling", ".ï" = "changeling", + ":ë" = "skrell", "#ë" = "skrell", ".ë" = "skrell", + ":î" = "tajaran", "#î" = "tajaran", ".î" = "tajaran", + ":ù" = "soghun", "#ù" = "soghun", ".ù" = "soghun" ) /mob/living/proc/binarycheck() diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index de8f271c6c8..402e2b84d0d 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -178,6 +178,7 @@ var/list/ai_list = list() ..() statpanel("Status") if (client.statpanel == "Status") + stat(null, "Station Time: [worldtime2text()]") if(emergency_shuttle.online && emergency_shuttle.location < 2) var/timeleft = emergency_shuttle.timeleft() if (timeleft) diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 6a5407e3a92..81a85f7a5d8 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -18,17 +18,14 @@ return if (length(message) >= 2) - if ((copytext(message, 1, 3) == ":b") || (copytext(message, 1, 3) == ":B") || \ - (copytext(message, 1, 3) == "#b") || (copytext(message, 1, 3) == "#B") || \ - (copytext(message, 1, 3) == ".b") || (copytext(message, 1, 3) == ".B")) + var/prefix = copytext(message, 1, 3) + if (department_radio_keys[prefix] == "binary") if(istype(src, /mob/living/silicon/pai)) return ..(message) message = copytext(message, 3) message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) robot_talk(message) - else if ((copytext(message, 1, 3) == ":h") || (copytext(message, 1, 3) == ":H") || \ - (copytext(message, 1, 3) == "#h") || (copytext(message, 1, 3) == "#H") || \ - (copytext(message, 1, 3) == ".h") || (copytext(message, 1, 3) == ".H")) + else if (department_radio_keys[prefix] == "department") if(isAI(src)&&client)//For patching directly into AI holopads. var/mob/living/silicon/ai/U = src message = copytext(message, 3) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 7d573947ccd..5ba8a959b9c 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -65,6 +65,10 @@ Stat() ..() + statpanel("Status") + if (client.statpanel == "Status" && ticker) + if (ticker.current_state != GAME_STATE_PREGAME) + stat(null, "Station Time: [worldtime2text()]") statpanel("Lobby") if(client.statpanel=="Lobby" && ticker) if(ticker.hide_mode) diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 3846ddf522c..c5e3ed37846 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -19,7 +19,7 @@ icon_state = "mini-uzi" w_class = 3.0 max_shells = 16 - caliber = " .45" + caliber = ".45" origin_tech = "combat=5;materials=2;syndicate=8" ammo_type = "/obj/item/ammo_casing/c45" diff --git a/code/world.dm b/code/world.dm index 1a85ada9ba6..d72ec0c02a8 100644 --- a/code/world.dm +++ b/code/world.dm @@ -155,9 +155,9 @@ /world/Reboot(var/reason) - spawn(0) + /*spawn(0) world << sound(pick('sound/AI/newroundsexy.ogg','sound/misc/apcdestroyed.ogg','sound/misc/bangindonk.ogg')) // random end sounds!! - LastyBatsy - + */ for(var/client/C in clients) if(config.server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite C << link("byond://[config.server]") diff --git a/html/changelog.html b/html/changelog.html index 8287d61b2d4..9f6db3ff8d5 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -70,6 +70,33 @@ should be listed in the changelog upon commit though. Thanks. --> +
+

31.05.2013

+

Segrain updated:

+ +
+ +
+

30th May 2013

+

proliberate updated:

+ +
+ +
+

30.05.2013

+

Segrain updated:

+ +
+

28th May 2013

Erthilo updated:

@@ -151,30 +178,30 @@ should be listed in the changelog upon commit though. Thanks. -->
-
-

April 24, 2013

-

faux updated:

- +
+

April 24, 2013

+

faux updated:

+
- +

24th April 2013

NerdyBoy1104 updated:

diff --git a/sound/music/THUNDERDOME.ogg b/sound/music/THUNDERDOME.ogg deleted file mode 100644 index 0a36b251b79..00000000000 Binary files a/sound/music/THUNDERDOME.ogg and /dev/null differ diff --git a/sound/music/space_oddity.ogg b/sound/music/space_oddity.ogg new file mode 100644 index 00000000000..8baa94c0432 Binary files /dev/null and b/sound/music/space_oddity.ogg differ