From 97836acb56f9640a6f6c87a2d2a0485cf9ca24fc Mon Sep 17 00:00:00 2001 From: Andrew Carroll Date: Thu, 30 May 2013 04:38:18 -0400 Subject: [PATCH 1/3] Add station time to AI, new_player Status tab --- code/modules/mob/living/silicon/ai/ai.dm | 1 + code/modules/mob/new_player/new_player.dm | 4 ++++ 2 files changed, 5 insertions(+) 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/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index a5b92bdc407..496047a91d8 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) From c8359235fb772a915b5291b4fc78fdae26c9fe56 Mon Sep 17 00:00:00 2001 From: Andrew Carroll Date: Thu, 30 May 2013 05:13:17 -0400 Subject: [PATCH 2/3] Update changelog.html --- html/changelog.html | 54 ++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index f7d9964526c..faf07592ed4 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -59,6 +59,14 @@ should be listed in the changelog upon commit though. Thanks. -->
+
+

30th May 2013

+

proliberate updated:

+
    +
  • Station time is now displayed in the status tab for new players and AIs.
    • +
+
+

28th May 2013

Erthilo updated:

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

April 24, 2013

-

faux updated:

-
    -
  • Mixed Wardrobe Closet now has colored shoes and plaid skirts.
    • -
  • Dress uniforms added to the Captain, RD, and HoP wardrobe closets. A uniform jacket has also been added to the Captain's closet. HoS' hat has been re-added to their closet. I do not love the CMO and CE enough to give them anything.
    • -
  • Atheletic closet now has five different swimsuits *for the ladies* in them. If you are a guy, be prepared to be yelled at if you run around like a moron in one of these. Same goes for ladies who run around in shorts with their titties swaying in the space winds.
    • -
  • A set of dispatcher uniforms will spawn in the security closet. These are for playtesting the dispatcher role.
    • -
  • New suit spawns in the laundry room. It's for geezer's only. You're welcome, Book.
    • -
  • Nurse outfit variant, orderly uniform, and first responder jacket will now spawn in the medical wardrobe closet.
    • -
  • A white wedding dress will spawn in the chaplain's closet. There are also several dresses currently only adminspawnable. Admins: Look either under "bride" or "dress." The bride one leads to the colored wedding dresses, and there are some other kinds of dresses under dress.
    • -
  • No more luchador masks or boxing gloves or boxing ring. You guys have a swimming pool now, dip in and enjoy it.
    • -
  • he meeting hall has been replaced with an awkwardly placed security office meant for prisoner processing.
    • -
  • Added a couple more welding goggles to engineering since you guys liked those a lot.
    • -
  • Flasks spawn behind the bar. Only three. Don't fight over them. I don't know how to add them to the bar vending machine otherwise I would have done that instead. Detective, you have your own flask in your office, it's underneath the cigarettes on your desk.
    • -
  • Added two canes to the medical storage, for people who have leg injuries and can't walk good and stuff. I do not want to see doctors pretending to be House. These are for patients. Do not make me delete this addition and declare you guys not being able to have nice things.
    • -
  • Secondary entance to EVA now directly leads into the medbay hardsuit section. Sorry for any inconviences this will cause. The CMO can now fetch the hardsuits whenever they want.
    • -
  • Secondary security hardsuit has been added to the armory. Security members please stop stealing engineer's hardsuits when you guys want to pair up for space travel.
    • -
  • Firelocks have been moved around in the main hallways to form really ghetto versions of airlocks.
    • -
  • Violin spawns in theatre storage now. I didn't put the piano there though, that was someone else.
    • -
  • Psych office in medbay has been made better looking.
    • -
+
+

April 24, 2013

+

faux updated:

+
    +
  • Mixed Wardrobe Closet now has colored shoes and plaid skirts.
    • +
  • Dress uniforms added to the Captain, RD, and HoP wardrobe closets. A uniform jacket has also been added to the Captain's closet. HoS' hat has been re-added to their closet. I do not love the CMO and CE enough to give them anything.
    • +
  • Atheletic closet now has five different swimsuits *for the ladies* in them. If you are a guy, be prepared to be yelled at if you run around like a moron in one of these. Same goes for ladies who run around in shorts with their titties swaying in the space winds.
    • +
  • A set of dispatcher uniforms will spawn in the security closet. These are for playtesting the dispatcher role.
    • +
  • New suit spawns in the laundry room. It's for geezer's only. You're welcome, Book.
    • +
  • Nurse outfit variant, orderly uniform, and first responder jacket will now spawn in the medical wardrobe closet.
    • +
  • A white wedding dress will spawn in the chaplain's closet. There are also several dresses currently only adminspawnable. Admins: Look either under "bride" or "dress." The bride one leads to the colored wedding dresses, and there are some other kinds of dresses under dress.
    • +
  • No more luchador masks or boxing gloves or boxing ring. You guys have a swimming pool now, dip in and enjoy it.
    • +
  • he meeting hall has been replaced with an awkwardly placed security office meant for prisoner processing.
    • +
  • Added a couple more welding goggles to engineering since you guys liked those a lot.
    • +
  • Flasks spawn behind the bar. Only three. Don't fight over them. I don't know how to add them to the bar vending machine otherwise I would have done that instead. Detective, you have your own flask in your office, it's underneath the cigarettes on your desk.
    • +
  • Added two canes to the medical storage, for people who have leg injuries and can't walk good and stuff. I do not want to see doctors pretending to be House. These are for patients. Do not make me delete this addition and declare you guys not being able to have nice things.
    • +
  • Secondary entance to EVA now directly leads into the medbay hardsuit section. Sorry for any inconviences this will cause. The CMO can now fetch the hardsuits whenever they want.
    • +
  • Secondary security hardsuit has been added to the armory. Security members please stop stealing engineer's hardsuits when you guys want to pair up for space travel.
    • +
  • Firelocks have been moved around in the main hallways to form really ghetto versions of airlocks.
    • +
  • Violin spawns in theatre storage now. I didn't put the piano there though, that was someone else.
    • +
  • Psych office in medbay has been made better looking.
    • +
- +

24th April 2013

NerdyBoy1104 updated:

From db07fd16fd0a8ec4ab9a89c7f4b238d9e2c65e2c Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Thu, 30 May 2013 18:54:31 +0700 Subject: [PATCH 3/3] Fixes an issue where an uzi could not be reloaded, they can now be reloaded with boxes of .45 bullets. --- code/modules/projectiles/guns/projectile/automatic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"