Commit Graph

1178 Commits

Author SHA1 Message Date
Hawk-v3
3a3e857e1d Justice Suits, Try 2 2012-02-26 23:29:11 +00:00
SkyMarshal
95d89e8491 Removed the scratch hat from one of the costumes. (Good god, that was an irritating animation)
Cleaned up the cloning machine searching code a tad.
The kitty ears tail is no longer animated.
2012-02-26 09:29:38 -07:00
cib
76cee10c6a Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-02-24 06:41:38 -08:00
cib
0612deab58 Bug fix #484: The cocoa plant had 6 growth stages in its definition, but only 5 icon states. Changed the definition to 5. 2012-02-24 06:19:54 -08:00
petethegoat@gmail.com
8162f22772 Circular saw updated to a sprite which looks less like a pizzacutter and more like a surgical implement.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3177 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-23 17:13:12 +00:00
petethegoat@gmail.com
56e25becbe Fixes for science/chemistry/genetics jumpsuit icons.
Virologist gets a new jumpsuit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3171 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-23 02:06:11 +00:00
petethegoat@gmail.com
f1ee426a8f Buckling to chairs no longer causes you to drop anything.
Added Nodrak's Jump to Mob verb.
Added Sieve's lantern fix. Commented out the silicate recipe.
Added Skaer's sec cartridge box to the armoury.

Moved the check_if_buckled() proc to mob/living, rather than having it repeated.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3168 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-22 00:36:56 +00:00
Jimapples
5ee546ac44 CURRETS MAN CURROTS. replaced with something that makes sense.
Signed-off-by: Apples <chicken_face@ymail.com>
2012-02-20 22:42:38 +00:00
SkyMarshal
cd9b569dda Fix for stupid. 2012-02-19 21:47:28 -07:00
SkyMarshal
37f39de861 CentCom doors are less hackable.
Clamped values on the regeneration superpower
Moved detective work to a modules subfolder
2012-02-19 21:09:11 -07:00
Melvin Melonstorm
b57f23bda4 Big toxins lab update! It's now way better, with two burn chambers and a
mixing and filtration room, along with a bigger observatory and an
'office' for plasma researchers, i.e. a table layout similar to the one
in chemistry. Instead of a chemical vendor, plasma researchers now got
their own custom vendor with assembly parts for bombastic bombs. The
maintenance tunnel's still kept between a double set of airlocks.

There is a problem with the vents and scrubbers of the office and burn
chamber room not being detected, though. (Miniature, Hawk, take a look
at it.)
2012-02-18 02:04:23 +01:00
SkyMarshal
b0eebb2edb Reverted some layer adjustments I did that seem to have broken things, bugfixes for operating tables, choking people, and CPR, giving. Also added sterile mask box sprite, and tossed the singularity crap into a spawn(0) to try and reduce lag. 2012-02-17 12:56:46 -07:00
Albert Iordache
cc6c63edd7 Merge pull request #423 from caelaislinn/master
added a couple of new clothing items, updated some sprites
2012-02-16 08:29:15 -08:00
SkyMarshal
b5c1d99471 Added some more feedbacks on the blood_DNA stuff
Fixed up some chemistry stuff
Nitrogen now adds atmospheric nitrogen when splashed on the ground.
2012-02-14 21:34:52 -07:00
CaelAislinn
43ead88027 fixes to new clothing
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-15 07:04:26 +10:00
CaelAislinn
9d798d3f95 updated some sprites, added new clothing
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-15 06:58:50 +10:00
kortgstation@gmail.com
8caa698d48 Chaplains are no longer immune to cult magic. Instead, a new item, the null rod, spawns in the chaplains office. Having the rod on your person will make you immune to cult magic.
Runes are now dispelled with the null rod, not the bible.

Chaplains can no longer self heal with the bible.

Simple animals can now attack mechas and critters 

Constructs no longer take extra damage from bibles.

Fueltanks now explode when shot by lasers or bullets.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3125 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-14 03:29:18 +00:00
CaelAislinn
9ee093b70e added a couple of new hats, updated some sprites
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-14 06:05:40 +10:00
baloh.matevz
32d8a7b6ce - Added the security officer, warden and hos jumpsuits by Khodoque:
http://nanotrasen.com/phpBB3/viewtopic.php?f=9&t=7627&start=20#p89942
Screenshot:
http://www.kamletos.si/new%20security%20jumpsuits.PNG

- Closets in security and the outpost that were labeled as "red wardrobe" are now labeled as "security wardrobe".

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3120 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-13 19:07:55 +00:00
Tastyfish
0dc9bc325b upgraded medical console to be like sec console 2012-02-12 09:55:02 -05:00
Tastyfish
aeafc2ffa5 can eat all foods with fork like a sane person now 2012-02-12 07:07:16 -05: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
quartz235@gmail.com
8e745d6bd2 i am the greatest coder of all time
and am also amazing at thoroughly testing what i make

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3103 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 19:32:34 +00:00
quartz235@gmail.com
5c53c4e7b7 -Fixed a typo that caused arcade machines to runtime 1/11 times
-Made water balloon have a lower case name for logical BYOND parsing

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3102 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 18:30:22 +00:00
baloh.matevz
37c7a57054 - Dropped support for attaching photos to ID cards. The feature was never fully implemented and the information you got from them was misleading and wrong.
- Backpacks max_combined_w_class is now 21 instead of 20, meaning it can store 7 box-sized items instead of 6 box sized items + 1 small item (which the box is supposed to hold anyway)
- Added many fire alarms around the station to areas that either lacked them or where they were too rare
- Added 4 hazard vests to the atmospherics departments for atmos techs who prefer hazard vests to firesuits.
- Added these changes to the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3092 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 15:03:33 +00:00
baloh.matevz
d070a44078 - Power alarms on z level 1 now update to their proper alert level state when spawned. They now spawn with the green alert level overlay at round start.
- Removed the window/north, window/east and the other dir-specific window subclasses
- Request console global announcements no longer have the leading space
- Wrenching wooden table parts now gives wood instead of metal
- Replaced the engineering singularity viewing cameras with EMP proof cameras

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3085 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 05:37:58 +00:00
baloh.matevz
3a0a764243 Crayon boxes are now storage items. I have no idea why they weren't storage items to being with but now they are.
6 storage slots, can only hold crayons. Icon_state is properly updated when crayons are taken out as well as when crayons are put in.

Updated uterus and 2.0.8 with the new type path, which is /obj/item/weapon/storage/crayonbox

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3082 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 01:46:19 +00:00
CaelAislinn
0edd231592 added new custom items
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-11 07:24:50 +10:00
quartz235@gmail.com
a6c2e6e105 - Added water balloons (sprites courtesy of Sieve,) these can be filled with most reagents and burst on throwing if filled, applying the reagents to whatever is hit (along with everything else on that tile.) These are winnable from the arcade, for now. I'll probably think of a better way to implement them.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3075 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-10 06:55:03 +00:00
CaelAislinn
03f970de65 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Conflicts:
	code/game/objects/closets/secure/engineering.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-10 09:11:08 +10:00
baloh.matevz
c12a1b4206 Added the caution code, sprited by magicbones, not present anywhere on the map
http://nanotrasen.com/phpBB3/viewtopic.php?f=10&t=4548&start=50#p37266

Added a power switch (/obj/structure/powerswitch), which is used to split or connect two cables.

The way it works is simple. It connects the powernets by adding cable on the floor it's on and removing it when it's turned off.

In-file description:
//This is a power switch. When turned on it looks at the cables around the tile that it's on and notes which cables are trying to connect to it.
//After it knows this it creates the number of cables from the center to each of the cables attempting to conenct. These cables cannot be removed
//with wirecutters. When the switch is turned off it removes all the cables on the tile it's on.
//The switch uses a 5s delay to prevent powernet change spamming.

Screenshot:
http://www.kamletos.si/power%20switch.PNG

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3072 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-09 21:11:20 +00:00
SkyMarshal
463d078cd4 Added chemistry's big beakers to the supply pack.
Security vending machines now have Evidence Bag boxes.
2012-02-09 10:53:09 -07:00
quartz235@gmail.com
dddd20f11f - Removing the atmospherics vending machine until such time as actual sprites for it (Working, unpowered, broken) are available
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3061 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-09 01:29:39 +00:00
petethegoat@gmail.com
3978a42d8b Added Sieve's 'connected to port' and 'tank attached' icons for pumps and scrubbers.
And I most certainly did not add a special new shirt, with icons by Ausops. No sir.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3060 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-08 19:42:03 +00:00
CaelAislinn
b38922f163 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-08 18:16:09 +10:00
Albert Iordache
e96e8bc19d Moved the definitions of id cards from weapon.dm to weapons/cards_ids.dm 2012-02-08 08:10:15 +02:00
CaelAislinn
22811eaf26 added personal lockers to most departments, balanced job equipment between wardrobe closet and locker, miscellaneous tweaks (including fix to taj whisp/speak, it should work fine now except for radios)
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-08 11:47:07 +10:00
Albert Iordache
7df0181e60 Code cleanup: renamed the ID card's variable "registered" to "registered_name" for better clarity 2012-02-07 20:05:43 +02:00
Albert Iordache
a20481062c Cleaned up parts of the code, no other changes 2012-02-07 20:05:42 +02:00
kortgstation@gmail.com
8aa398f7c4 Oh god Im fucking retarded hurr fixed a messed up object path from last commit
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3042 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-06 00:34:59 +00:00
kortgstation@gmail.com
cb57fae3b8 The "X FAILS TO PUSH Y'S FAT ASS OUT OF THE WAY" message now only displays to the person shoving, so those nearby are not subjected to chat spam.
Added a "Relentless" var to mobs that makes them unshoveable if their intent is anything but help.

Alien Queens are relentless.

Constructs are relentless, can now push things, and have automated movement disabled (because it was bugging the hell out of me when testing)

Shades also have automated movement disabled.

The gladiator costume now has a chance to spawn in the theatre (sprites by Ausops)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3040 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-05 23:56:15 +00:00
baloh.matevz
050accb57b - Brought 2.0.8 and uterus up to date with the new type paths.
- Added an atmostech belt that spawns with the same tools as the engineer full belt, just the wire is replaced by an analyzer.
- Atmos techs now spawn with this belt
- Added a detective-styled personal closet, that contains a satchel, which contains a wallet, which contains one or two spacecash items and a coin.
- Slightly redesigned two of the dorm rooms so they have this new cabinet - closet with the stuff mentioned above.
- Slightly changed the spawn order of items in engineering closets so that hazard vests spawn above toolboxes. Hopefully this will spare a few fiddly clicks for engineers.
- Detective locker now spawns with the locked sprite
- Engineering now has the L2 radioactive suit lockers that contain rad suits instead of that crate.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3039 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-05 22:41:48 +00:00
petethegoat@gmail.com
2c58840a4f Added throwing items over tables, thanks to SkyMarshal.
Improved cigarette code, mostly grammatical fixes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3036 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-05 17:22:39 +00:00
CaelAislinn
9e4539fdce most cameras on the station are now split up into networks. the larger departments all have camera computers to monitor their departments (security and ai can see everywhere). ai can now see multiple networks at once, legacy proc ai_network_change() now acts as a shortcut to let the ai jump to a specific network (picks a random cam in that network). cleaned up / added / removed numerous cameras all over the station to be in line with this update. all camera monitor computers can be built with a single camera circuitboard, simply click the circuitboard when in hand and select a department (must be authorised by a department head).
scattered minor updates, including removing unnecessary preceeding whitespace in the examine() verb.

added the tajaran as an adminspawnable race, see the forum topic for more information. features: new non-human (feline) playable mob, slightly more vulnerable to heat than humans, can speak in private language understood only by other tajarans (and possibly adept adminhackers), uses mob/living/carbon/human as a base template, so there will be unintended side effects (such as human hair overlays).
known bugs: ears/tail overlays, hud health (and temp?) display not updating, genetics will probably go haywire, speech bug means nothing can be said (high priority).

for the love of god, let this commit go through without trouble.

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-06 02:46:00 +10: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
baloh.matevz
4c92d1c152 Added a cheap lighter so that zippos will have some company.
The cheap lighter can be purchased at vending machines and comes in 4 colors: green, yellow, cyan and red.

Technical info:

The path
/obj/item/weapon/zippo

was changed to 
/obj/item/weapon/lighter/zippo

The new lighter is
/obj/item/weapon/lighter/random

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3033 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-04 22:23:42 +00:00
baloh.matevz
0fa1f3d924 Examining humans is now smarter and displays only the things you can see. Certain outerwear suits and helmets hide other pieces of clothing on you.
A diagram that displays what can hide what:
http://www.kamletos.si/inventory%20visibility%20hierarchy.png

Note that not all suits and helmets hide stuff.

Added this to the changelog.

Technical information:

Renamed gimmick.dm to z_gimmick.dm because whenever I doubleclicked on any piece of clothing in the object tree it always pointed me to some random gimmick item instead of the root definition. Now the file is at the bottom of the folder and so everything else is looked up first.

Created a bitflag variable which is used to determine which piece of clothing hides another. The variable is flags_inv and the flags it contains are:

#define HIDEGLOVES 1		//APPLIES ONLY TO THE EXTERIOR SUIT!!
#define HIDESUITSTORAGE 2	//APPLIES ONLY TO THE EXTERIOR SUIT!!
#define HIDEJUMPSUIT 4		//APPLIES ONLY TO THE EXTERIOR SUIT!!
#define HIDESHOES 8			//APPLIES ONLY TO THE EXTERIOR SUIT!!
#define HIDEMASK 1			//APPLIES ONLY TO HELMETS!!
#define HIDEEARS 2			//APPLIES ONLY TO HELMETS!!
#define HIDEEYES 4			//APPLIES ONLY TO HELMETS!!

The first 4 only apply to exterior suits and the last 3 only to helmets, so they can use the same numbers. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3031 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-04 20:09:46 +00:00
trubblebass@gmail.com
6b23587fb6 Comitted on behalf of BubbleWrap
- Boxes can now be collapsed down into cardboard sheets.
- Cardboard sheets are stackable (like glass and metal).
- Cardboard sheets can be made back into boxes when needed.
- Cardboard sheets can also be made into a cardboard cyborg costume.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3028 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-03 01:06:41 +00:00
CaelAislinn
8eb550f794 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-01 18:18:04 +10:00