Commit Graph

4401 Commits

Author SHA1 Message Date
Erthilo
dd5ed6a1cd Adds a sounds for implant removal, and better messages for the rag. 2012-05-21 21:02:01 +01:00
Erthilo
4114e246ee Merge fixes, and spelling corrections. 2012-05-21 20:47:55 +01:00
Erthilo
03dc270006 TG: Fix for dragging HUD elements into lockers.
Revision: r3635
Author: 	 petethegoat
2012-05-21 20:42:15 +01:00
Erthilo
552fe3040e TG: - Fixed the bug where a belt which spawned on you would not display it's
contents until dropped.
Revision: r3634
Author: 	 baloh.matevz
2012-05-21 20:40:55 +01:00
Erthilo
7fd99c7d3a TG: -Bunch of new/updated locker sprites. Most noticeable in mining and engineering
-New wardrobe closets for several departments
Revision: r3633
Author: 	 ericgfw...@hotmail.com
2012-05-21 20:40:08 +01:00
Erthilo
c84aa96cc4 TG: The new 'sleek' user interface is going live.
OLD screenshots (Actual hud uses black/orange scheme):
Humans:
http://www.kamletos.si/ss13%20hud%2018%20human%20standard.png
http://www.kamletos.si/ss13%20hud%2018%20human%20full.png

Borgs:
http://www.kamletos.si/ss13%20hud%2018%20borg.png

Aliens:
http://www.kamletos.si/ss13%20hud%2018%20larva.png
http://www.kamletos.si/ss13%20hud%2018%20alien.png

Monkeys:
http://www.kamletos.si/ss13%20hud%2018%20monkey.png
Revision: r3630
Author: 	 baloh.matevz
2012-05-21 20:29:35 +01:00
petethegoat@gmail.com
bf954c6df8 Fix for dragging HUD elements into lockers.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3635 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-21 19:02:55 +00:00
baloh.matevz@gmail.com
ae593c7a34 - Fixed the bug where a belt which spawned on you would not display it's contents until dropped.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3634 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-21 17:28:11 +00:00
Erthilo
7894a7e0ef TG: - PDA messaging reworked a bit. If you receive a message with your PDA somewhere
on your person (so not in a backpack), the message will be displayed to you in
the text box along with the name and rank of the sender. A reply button will be
next to this to make replying easier. The PDA beep will still appear and the PDA
must not be in silent mode for this to work.

Screenshot:
http://www.kamletos.si/PDA%20communication%203.PNG

Added this to the changelog.

Revision: r3628
Author: 	 baloh.matevz

-Added confirmation prompt when calling the shuttle as an AI
-Glass airlocks no longer super-silent

Revision: r3629
Author: 	 ericgfw...@hotmail.com
2012-05-21 17:20:23 +01:00
Erthilo
4bda83ec51 Implant removal surgery. Scalpel > Hemostat > Restractor > Hemostat (Multiple times may be needed). For now syndicate implants simply disintegrate. Other implants can be put back into an implanter.
Also allows rag to hold 5 reagents, smother people with it, and also stops it causing attack messages.
2012-05-21 15:13:15 +01:00
ericgfwong@hotmail.com
b6a70eab34 -Bunch of new/updated locker sprites. Most noticeable in mining and engineering
-New wardrobe closets for several departments
-Showers now have soap. Don't drop it!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3633 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-21 11:54:51 +00:00
caelaislinn
b626812c83 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/game/machinery/computer/lockdown.dm

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-05-21 17:48:12 +10:00
baloh.matevz@gmail.com
88888ed5ab - Fixed some odd behavior with storage items when you drag-dropped them from the floor without ever picking them up.
- New hotkeys: Delete is the 'stop dragging' button and insert cycles through intents.
- Added some user feedback messages to the drop, throw, stop-dragging and cycle-intents hotkeys.
- Added the hotkeys thing to the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3631 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-21 00:50:13 +00:00
baloh.matevz@gmail.com
3394098496 The new 'sleek' user interface is going live.
Screenshots:
Humans:
http://www.kamletos.si/ss13%20hud%2018%20human%20standard.png
http://www.kamletos.si/ss13%20hud%2018%20human%20full.png

Borgs:
http://www.kamletos.si/ss13%20hud%2018%20borg.png

Aliens:
http://www.kamletos.si/ss13%20hud%2018%20larva.png
http://www.kamletos.si/ss13%20hud%2018%20alien.png

Monkeys:
http://www.kamletos.si/ss13%20hud%2018%20monkey.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3630 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-21 00:04:08 +00:00
ericgfwong@hotmail.com
ce63ae2247 -Added confirmation prompt when calling the shuttle as an AI
-Replaced cargo bot delivery chute door with plastic flaps
-Glass airlocks no longer super-silent

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3629 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-20 23:56:34 +00:00
Erthilo
eb599dd33a Merge pull request #1119 from SkyMarshal/BugFixes
Bug fixes
2012-05-20 14:42:30 -07:00
SkyMarshal
58570a0f65 As many bugfixes as I could cram into here. 2012-05-20 14:23:10 -07:00
baloh.matevz@gmail.com
d14ae05f19 - PDA messaging reworked a bit. If you receive a message with your PDA somewhere on your person (so not in a backpack), the message will be displayed to you in the text box along with the name and rank of the sender. A reply button will be next to this to make replying easier. The PDA beep will still appear and the PDA must not be in silent mode for this to work.
Screenshot:
http://www.kamletos.si/PDA%20communication%203.PNG

Added this to the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3628 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-20 21:10:52 +00:00
Erthilo
f81b043787 Fixes for forcing no hair/face hair. Shuffles checks around for Pick Up Verb. 2012-05-20 21:37:10 +01:00
SkyMarshal
0cebc4d1f2 Merge pull request #1116 from SkyMarshal/BugFixes
Fixes Tajaran Transformation.  Few sanity checks and bugfixes added.
2012-05-20 12:43:30 -07:00
SkyMarshal
69b6926293 Fixes Tajaran Transformation. Few sanity checks and bugfixes added. 2012-05-20 12:32:00 -07:00
caelaislinn
4ffbf02569 lowered radsuits from 4 to 1 per crate
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-05-20 22:26:01 +10:00
Erthilo
8a0809b7d6 Fixes Track With Camera bug. Was probably my fault. Sorry! 2012-05-20 01:48:58 +01:00
Erthilo
229fad369e Adds right-click verbs for pick up and closet open/close. 2012-05-20 00:25:05 +01:00
Erthilo
4d67491654 More update_clothing() calls. 2012-05-20 00:02:23 +01:00
cib
bc782cb575 Merge github.com:Baystation12/Baystation12
Conflicts:
	html/changelog.html
2012-05-19 19:42:30 +02:00
Erthilo
4406fca8c2 Merge and compile fixes, changelog too. 2012-05-19 02:39:50 +01:00
Erthilo
d538d91137 TG: - Office chairs are now unanchored and can be pulled around, even when there is
someone on them, making them the perfect prisoner transport vehicle~
- The extinguisher will now tell you when it's empty
- Office chairs and extinguishers.... OH HOW COULD I RESIST. Yes, you can have
extinguisher derby races with office chairs :)

(Shame there are currently no office chairs on the map)
Revision: r3615
Author: 	 baloh.matevz
2012-05-19 01:54:24 +01:00
Erthilo
6e3dd19cc7 TG: - Ported over (Well basically completely recoded) the smooth window code from
Bay 12.
Revision: r3613
Author: 	 baloh.matevz
2012-05-19 01:49:12 +01:00
Erthilo
4f0763ada4 TG: - Wallets once again spawn in the satchels in the cabinets in the dorm.
- Wallets now fit in pockets
- If you are clicking on a storage item in your pocket with an empty hand it
will return that item to your hand
Revision: r3610
Author: 	 baloh.matevz
2012-05-19 01:44:24 +01:00
Erthilo
f76addd642 TG: - Removed hat storage.
Revision: r3608
Author: 	 baloh.matevz

TG: -Added missing door assemblies and associated sprites
Revision: r3609
Author: 	 ericgfw...@hotmail.com
2012-05-19 01:41:04 +01:00
Erthilo
867db1876e TG: -New sprites for Cargo, HoP, and Captain's lockers
-New glass airlocks for science and supply departments
-Added more department-specific door sprites to map
Revision: r3605
Author: 	 ericgfw...@hotmail.com
2012-05-19 01:25:11 +01:00
Erthilo
7283b862df TG: Moved sinks into watercloset.dm, removed sink.dm
Sink path has changed- /obj/machinery/sink to /obj/structure/sink
/obj/machinery/sink/kitchen2 to /obj/structure/sink/kitchen
Sinks have been slightly updated, if you're wearing gloves, your hands will stay
bloody underneath. Nothing drastic.

Added Cheri's puddles.

Updated showers, they actually clean now. They're pretty powerful, so I'm going
to add a way to make them lethal, to ensure the washing machines still get some
use.

Updated hydroponics trays, to make them work better with soil.

And a couple of map fixes, for toilets that were facing the wrong way in the
prison and on the mining asteroid.
Revision: r3603
Author: 	 petethegoat
2012-05-19 01:08:56 +01:00
baloh.matevz
db3c2d3771 - Office chairs are now unanchored and can be pulled around, even when there is someone on them, making them the perfect prisoner transport vehicle~
- The extinguisher will now tell you when it's empty
- Office chairs and extinguishers.... OH HOW COULD I RESIST. Yes, you can have extinguisher derby races with office chairs :)

(Shame there are currently no office chairs on the map)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3615 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-19 00:01:04 +00:00
baloh.matevz
b4e0c3d850 - Ported over (Well basically completely recoded) the smooth window code from Bay 12.
Screenshot:
http://www.kamletos.si/bay12%20windows.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3613 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-18 22:53:10 +00:00
baloh.matevz
8e3a2630cb - Wallets once again spawn in the satchels in the cabinets in the dorm.
- Wallets now fit in pockets
- If you are clicking on a storage item in your pocket with an empty hand it will return that item to your hand

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3610 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-18 20:07:25 +00:00
ericgfwong@hotmail.com
d9fff38dd0 -Added missing door assemblies and associated sprites
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3609 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-18 20:02:33 +00:00
baloh.matevz
382a676a0a - Implanting someone else now takes five seconds. A message is shown to all viewers when you start and when you finish. The person who is being implanted as well as you need to not move during this time.
- Implanting remains instantaneous if you are implanting yourself.
- Standardized implanter code

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3607 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-18 18:45:18 +00:00
cib
5bd2508fbc Added Meme weaknesses, added more Meme verbs. 2012-05-18 16:31:40 +02:00
ericgfwong@hotmail.com
08e5f0a08e -New sprites for Cargo, HoP, and Captain's lockers
-New glass airlocks for science and supply departments
-Added more department-specific door sprites to map

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3605 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-18 07:33:42 +00:00
unknown
bf66f618f1 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-05-18 09:03:51 +03:00
Erthilo
fa8e8decb4 Made rollerbeds collapsible. They don't fit in containers, so it's just easier to take to location. Added new sprites and sounds for cable cuffs, and new sounds for table smashy. 2012-05-18 00:56:53 +01:00
Erthilo
cf6a56433b Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	html/changelog.html
2012-05-18 00:46:20 +01:00
petethegoat@gmail.com
f01afc7edd Moved sinks into watercloset.dm, removed sink.dm
Sink path has changed- /obj/machinery/sink to /obj/structure/sink
/obj/machinery/sink/kitchen2 to /obj/structure/sink/kitchen
Sinks have been slightly updated, if you're wearing gloves, your hands will stay bloody underneath. Nothing drastic.

Added Cheri's puddles.

Updated showers, they actually clean now. They're pretty powerful, so I'm going to add a way to make them lethal, to ensure the washing machines still get some use.

Updated hydroponics trays, to make them work better with soil.

And a couple of map fixes, for toilets that were facing the wrong way in the prison and on the mining asteroid.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3603 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-17 23:16:46 +00:00
Erthilo
fb71890c18 TG: -Added WJohnston's scrubs to Medical Doctor lockers.
-Added two new syndicate bundles
-Reduced cost of thermals to 3 telecrystals (formerly 4)
-Singularity Beacons are now spawned from a smaller, portable device.
-CMO and QM jumpsuits made more unique.
-Updated Cargo Tech jumpsuit and sprite
-Edited Warden's jumpsuit striping to match his jacket
-Added WJohnston's CMO bio hood
-Bug fixes for Nodrak's Random button (Still not actually in. - Erthilo)

-Fixed misaligned downed sprites for HoS's coat and medical scrubs
-Reduced number of scrubs in medical lockers, randomized their colours

Revision: r3599 &  r3601
Author: 	 ericgfw...@hotmail.com
2012-05-17 22:13:44 +01:00
Erthilo
6130ce6d4a Adds camera film which can be used to refill cameras. Added to detectives wardrobe and arts and crafts crate. Minor grammar and punctuation fixes. 2012-05-17 21:32:34 +01:00
Erthilo
e9c3c990b1 Ported Animus Station's currency system, credit to @EditorRUS. ATM's now require a pin which is generated and stored in mob notes. Space cash renamed to stack of credits, and same value credits can be stacked together. Credits are generated randomly between 500 to 2000 credits. Credits or coins can be inserted and converted to credits. Still not used for anything! 2012-05-17 20:50:47 +01:00
SkyMarshal
30a09bf66a Metal foam now blocks air. 2012-05-16 23:33:12 -07:00
ericgfwong@hotmail.com
470a3373e6 -Fixed misaligned downed sprites for HoS's coat and medical scrubs
-Reduced number of scrubs in medical lockers, randomized their colours

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3601 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-17 04:54:09 +00:00
Erthilo
38299caad4 Fix for Abi's fix, thanks to @Sunfall! 2012-05-17 03:11:09 +01:00