Commit Graph

74 Commits

Author SHA1 Message Date
Fox-McCloud
3e1fac8c94 [Goonchem] FirstAid Transitions 2015-03-25 08:45:36 -04:00
Markolie
4fb7a95cff ERT equipment update 2015-03-04 17:16:19 +01:00
ZomgPonies
887e4b93f7 Ported outside crate manifest 2015-02-25 14:02:14 -05:00
Artorp
62f5006944 Ports mime backpack from /tg/station 2015-02-22 06:27:36 +01:00
Fox-McCloud
03c61ed3ab Foxes 2014-12-22 08:32:32 -05:00
Markolie
37b86cd8f1 Xenos gamemode rework 2014-12-13 02:08:22 +01:00
SamCroswell
7c2f2d09d2 Adds Duffelbag, Fixes Inhand for Hammers 2014-11-20 20:04:41 -05:00
Fox-McCloud
dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
AlexanderSeto
586e9633f1 Adds the rapid part exchange device 2014-05-24 08:56:51 -07:00
Necaladun
c199a41b21 item and map
Custom items for mark and the map uploaded
2014-04-13 15:09:27 +09:30
Aranclanos
eb76256f04 Adds the captain's medal to the medal's lockbox.
Fixes issue 2358

Conflicts:
	code/game/objects/items/weapons/storage/lockbox.dm
2014-01-16 21:55:00 -05:00
ZomgPonies
dcaeea24bf Adding large cardboard boxes 2013-12-25 07:06:13 -05:00
ZomgPonies
cc05932fb5 Emag ATM, cash bags! 2013-11-25 05:29:51 -05:00
ZomgPonies
6e2d0eee6f New PDA painter item 2013-09-11 17:27:51 -04:00
Erthilo
6281c11f22 Advmedkit now has green cross. Hime cut looks less derp from the side. 2013-08-12 12:33:02 +01:00
comma
de1309102e Splints!
Actually added 2 commits before, but now with full capabilities.
2013-08-01 05:58:55 +04:00
NerdyBoy1104
390029007d Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from. 2013-04-23 22:52:08 +01:00
Cael_Aislinn
3c745a1ee2 added some storage boxes + gearbelt
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-15 01:03:01 +10:00
Cael_Aislinn
f8f9397636 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	icons/obj/library.dmi
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 23:01:33 +10:00
Cael_Aislinn
ae2b667f38 fixed icon issues with large crates, added a reinforced large secure crate (different aesthetically)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 21:18:15 +10:00
Cael_Aislinn
53793fc2aa Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 19:03:18 +10:00
Cael_Aislinn
efd586a9e1 added large metal crates (secure and normal variants) to be resprites of normal crates
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 01:32:28 +10:00
Cael_Aislinn
ecb02a3acd reduced output message frequency for artifacts and analysis machinery, tweaked tools + finds, added storage item for excav picks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-19 02:30:43 +10:00
ericgfwong@hotmail.com
4d9af5c0a4 Recolored a bunch of objects to make medbay's department colours more clear and consistent. The colours are green/white.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5593 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-21 00:11:48 +00:00
d_h2005@yahoo.com
ffe7bc7a90 -Adds scythes
-Adds weed control crates, orderable by cargo techs, for the purpose of kudzu control.
-You can now construct folders with cardboard sheets.
-Moves newspaper sprites out of weapons.dmi

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5206 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-27 02:20:20 +00:00
petethegoat@gmail.com
0c9195fbe4 Fixes issue 1097. Shaft Miners not getting pda
Fixes issue 1118. duplicating trashbags
Fixes issue 1117. evidence bag issues

Syndie shuttle can now travel to mining and the tcomms sat.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5152 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-21 17:17:00 +00:00
petethegoat@gmail.com
6af0e6ab84 Committing Lisa. God help me if this causes any corgi erp.
Also adding comfy chairs and office chairs to the metal recipes list.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4970 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 18:33:36 +00:00
petethegoat@gmail.com
5b1e7cb336 Removed the bandolier, on account of it looking like shit. In the two places where it was used, it's been replaced with the normal satchel.
Added the safe! A majestic two tumbler chunk of metal.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4882 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-15 15:01:16 +00:00
baloh.matevz
a2d11cf5c7 - Ported some stuff from baystation 12. Mostly sprites.
- Added pajama closets which contain 2 red and 2 blue pj's with 4 pairs of white shoes - for use in medbay and crew quarters. (pj sprites by baystation 12)
- Added the cart, plasma research, engineering and robotics vending machines from baystation 12 - Mostly for the sprites.
- Added science airlocks (sprites by baystation 12), made them work with our door construction / deconstruction mechanic. (those sprites are by me~)
- Added hazard doors, sprites by baystation 12. They're reskinned firedoors.
- Added two more styles of filing cabinets, all sprites from baystation 12.
- Changed the space law book's sprite to the one baystation 12 uses.
- Added a few floor sprites from baystation 12
- Added critter crates, sprites from baystation 12
- Added some surgery sprites from baystation 12
- Added plant sprites from baystation 12

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4229 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-30 06:50:26 +00:00
ericgfwong@hotmail.com
01ab14455a -Added in-hands for captain backpack and satchel
-Fixed in-hands for backpacks
-Updated changelog with my recent changes

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4095 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-17 09:32:04 +00:00
ericgfwong@hotmail.com
0f5b2f5a15 -Added Captain's Backpack & Satchel: https://dl.dropbox.com/u/831776/comdoms.png
-A few minor improvements to my own sprites

-Map changes to the Kitchen so the chef is more visible to his patrons
-Arrivals airlocks are no longer airless when shuttles dock

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4094 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-17 08:25:29 +00:00
petethegoat@gmail.com
72d72f7ce5 Fixed stamped supply slips not giving the points they're supposed to.
Added large crates, for dense objects. Currently they're only used for water and fuel tanks, and mulebots.

Removed uterus.dmm and tgstation.2.0.8.dmm from the repo, as they were unused and outdated.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3884 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-21 14:25:31 +00:00
d_h2005@yahoo.com
cded9a8282 -Wallets now have sprites for holding silver head IDs and red Centcom IDs.
-New spare ID box sprite. New pill-bottle box sprite.
-Added spades for botanists who want to play with dirt.
-A spade can be found in the hydroponics supply area, along with a couple spare tools useful for the job.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3782 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-10 07:07:35 +00:00
baloh.matevz
759a761813 - More stuff from Bay 12. Their satchels!
Screenshots:
http://www.kamletos.si/bay12%20satchels.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3617 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-19 00:52:15 +00:00
petethegoat@gmail.com
b19404f074 Sanity checking in robot move
Added CompactNinja's sterile masks box sprite

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3322 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-18 22:01:23 +00:00
petethegoat@gmail.com
d0308b3f64 Fixed and further improved package wrapping. Added a sprite for wrapped closets.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3302 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-15 21:02:36 +00:00
petethegoat@gmail.com
a3c9a4cf21 Added directionals for husks.
Added Khodoque's improved bucket and wallet sprites.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3299 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-15 17:33:39 +00:00
joe.heinemeyer@gmail.com
113beeb052 BS12 Detective Work port.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3229 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-02 05:23:08 +00:00
musketstgstation@gmail.com
eda31256df Added missing icon updates from r3216
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3217 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-29 22:53:02 +00:00
baloh.matevz
42fa87c2b2 - Putting a normal or a gold ID card into a wallet now properly updates the sprite. The sprite that's chosen is the sprite of the card which is first in the list of items. Removing an ID from the wallet also properly updates the sprite.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3106 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 21:00:03 +00:00
baloh.matevz
cc67d26201 - lightbulb and light tube w_class is now 1, large tube (used for floodlights) remains at 2.
- bulb and tube boxes now contain 21 bulbs or tubes, but can only store bulbs or tubes.
- added a mixed box of lights, which contains 14 tubes and 7 bulbs
- most of the areas which contained light boxes now contain these large mixed boxes.

Screenshot:
http://www.kamletos.si/bulbs.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3105 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 20:41:18 +00:00
petethegoat@gmail.com
d6e9a32346 Updated fitness. Athletic shorts are now available! http://i.imgur.com/kRPa2.png
Added a gold ID in wallet sprite for Erro.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3101 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 18:26:11 +00:00
baloh.matevz
9028fc227f A simple wallet storage item has been added that can hold 4 small items. The items it can store are defined in a list
It however includes spacecash, cards (id, data, emag), cigarette, penlight  (+ parapen), seeds, ointment, bruisepack, crayon, coins, dice, implanters, lighter, match, paper, pen, photo, dropper, screwdriver and a stamp.

Sprites by Aru 
http://nanotrasen.com/phpBB3/viewtopic.php?f=10&t=4548&start=40#p36594

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3034 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-05 01:13:13 +00:00
quartz235@gmail.com
216b62c810 Removed daedric bible option due to licensing and copyright infringement is bad okay
no seriously man don't do it

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2811 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-25 11:54:30 +00:00
vageyenaman@gmail.com
bbed525019 Santa's toy bag!
Fixed some miscellaneous stuff to prevent round-start crashing.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2758 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-21 07:04:55 +00:00
kortgstation@gmail.com
763c0ecf71 Can now make light tubes/bulbs in the autolathe
Old trashbag was buggy as fuck and useless. Didn't touch it's code, but replaced it's spawn in the janitors locker with a 20 slot, tiny item only storage object (new trashbag)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2577 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-30 05:35:40 +00:00
petethegoat@gmail.com
344ea49cac There are boxes of bodybags in the morgue and the armoury. Maybe the janitor's job will become less insurmountable as a result. You can also label them with a pen.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2317 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-02 18:05:04 +00:00
kortgstation@gmail.com
451ebb2d75 Added a new cult themed backpack. Can be summoned with the cult equip rune (if your back slot is empty) and one starts in the Chaplains locker.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2228 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-19 06:12:37 +00:00
petethegoat@gmail.com
84d995a01d Made new sprites for light tube and glasses boxes. (Bulb boxes only have bulbs in them, tube boxes only have tubes.)
Removed some awful descriptions from items which should not have descriptions.
See: paper, empty boxes.

Fixed a bug which would cause traitor packs to have an emergency O2 tank and breath mask in them.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2201 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-14 15:21:45 +00:00
baloh.matevz
0173d96a30 Erro does a 180 flip by agreeing that there are too few firesuits!
- Added an extra fire closet to atmos, as there are 3 atmos techs
- Added a fire supplies rack to maintenance near mining
- Added a fire suit near EVA

- Added redcoat suit, hat and bandolier. (Damn it, some sources say it's spelled bandoleer, some say it's bandolier... Damn you English language!)

- Added this to changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2131 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-05 19:24:20 +00:00