Commit Graph
2276 Commits
Author SHA1 Message Date
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 c61ddfd74f - Yet another Bay 12 port. This one adds their comfy and office chairs. :)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3614 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-18 23:17:03 +00:00
baloh.matevz b31ce8e533 - Ported BS12 code for smart tables. They now include T tables and full tables which continue into 1-tile thick tables. You still can't do everything ever but you can at least make T shaped table pieces.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3612 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-18 22:08:49 +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
caelaislinn 453ffce556 added WIP birdmen, tweaked / cleaned up gas turbine gens, tweaked lockdown computers and poddoors.
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-05-19 03:22:42 +10:00
caelaislinn 869da0db36 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-05-19 01:19:50 +10:00
cib 05f3330b0c Added more meme abilities. 2012-05-18 13:46:19 +02: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 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
ericgfwong@hotmail.com 44cf5ee86d -Individual dorms now have a button inside that bolts/unbolts the door
-Door control buttons give the user a message if they lack the access
-Virology door controls now properly restrict access
-Large beaker cost reduced to 5000u glass
-Shooooorts! They're comfy and easy to wear!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3602 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-17 20:10:22 +00: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
caelaislinn afc7e796b6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-05-18 04:10:14 +10:00
Albert Iordache c93bb9f245 Fixed #1079, airlock permissions for the prison wing and QM's office. 2012-05-17 13:41:01 +03:00
Albert Iordache 33f18717ad Fixed Get-Mob, #1038 2012-05-17 12:32:40 +03:00
SkyMarshal 30a09bf66a Metal foam now blocks air. 2012-05-16 23:33:12 -07:00
Cael Aislinn a625c23cc3 test
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2012-05-17 16:13:03 +10: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
ericgfwong@hotmail.com b54822362a -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

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3599 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-16 06:09:32 +00:00
Erthilo db3b96c0a7 Adds cable restraints that can be made from 15 lengths of coil, and fixes table grammar. Also reverts lockdown changes so it works for the Exodus for now. 2012-05-15 22:24:25 +01:00
SkyMarshal 0b3be860cb Table smashing is now more interesting. 2012-05-14 21:24:22 -07:00
Erthilo 51de17e8ad TG: Committing from the Proposed Commit forum:
Work by Neek
- Hulk Hogan moustache fix

Work by Yvarov
- Alien Unconciousness fix (Fixes  Issue 283 )
- - Also commented out alien snoring all over because aliens don't snore.
- Replacement light box fix (Fixes  Issue 398 )
- Syringe gun attack logs added (Fixes  Issue 465 )

Work by QualityVan
- Nettle and Death Nettle force based on potency.
Revision: r3593
Author: 	 johnsonmt88
2012-05-15 00:58:12 +01:00
Erthilo 496d6ce13b Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	code/defines/obj/supplypacks.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2012-05-15 00:51:50 +01:00
Erthilo 97141927ef TG: Fixed an issue where contraband crates could not be ordered and would prevent
other crates in the same shipment from arriving.

Generalised the crate contents randomisation code to allow for future random-
contents crates and avoid unnecessary copypasted code.
Revision: r3588
Author: 	 musketstgstation
2012-05-15 00:25:52 +01:00
Erthilo 363dd54b7e TG: A few map fixes, plus new toilets, urinals, and showers.
All bathroom stuff is fairly WIP at the moment.
The toilet path has changed from /obj/machinery/disposal/toilet to
/obj/structure/toilet
Revision: r3586
Author: 	 petethegoat
2012-05-15 00:11:18 +01:00
johnsonmt88@gmail.com d2736aa6ea Committing from the Proposed Commit forum:
Work by Neek
- Hulk Hogan moustache fix

Work by Yvarov
- Alien Unconciousness fix (Fixes Issue 283)
- - Also commented out alien snoring all over because aliens don't snore.
- Replacement light box fix (Fixes Issue 398)
- Syringe gun attack logs added (Fixes Issue 465)

Work by QualityVan
- Nettle and Death Nettle force based on potency.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3593 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-14 16:47:19 +00:00
cib 41a2b60520 Merge github.com:Baystation12/Baystation12 2012-05-14 17:55:19 +02:00
SkyMarshal 46e104f978 Merge pull request #1044 from Erthilo/master
TG Updates up to r3585
2012-05-13 21:38:34 -07:00
musketstgstation@gmail.com f6b2777313 Fixed an issue where contraband crates could not be ordered and would prevent other crates in the same shipment from arriving.
Generalised the crate contents randomisation code to allow for future random-contents crates and avoid unnecessary copypasted code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3588 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-14 00:48:27 +00:00
ericgfwong@hotmail.com 43f93a06c5 -Defined a new area for the prison wing, so ghosts won't teleport to the admin brig by accident
-Removed prison toilet disposals
-Reduced number of blast doors in prison wing, as it was overkill
-Fixes prison break event to also affect the prison wing
-Restores geneticists' supervisor text and headsets to include the RD
-HoP now starts with full access to his departments (all Supply and Civil)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3587 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-13 23:49:12 +00:00
SkyMarshal bdc0de5fd0 Fixes numerous bugs from the Runtimes topic, more sanity checking on pipes and atmos stuff for the new FEA. 2012-05-13 13:52:40 -07:00
Erthilo 1443df2beb TG: Updated fire extinguisher cabinets- mini extinguishers now fit in them, and the
path has changed!
/obj/structure/closet/extinguisher to /obj/structure/extinguisher_cabinet

Added Invisty's dragon dildo sprite
Updated the husk icons for carn

Revision: r3584
Author: 	 petethegoat

-New sound effects for circular saws and surgical drills.
-New sprites for mass-spectrometers and advanced mass-spectrometers.
-Sprites for empty bookshelves and book overlays added to library.dmi.

Revision: r3585
Author: 	 d_h2...@yahoo.com
2012-05-13 02:19:36 +01:00
Erthilo 8c3659b1c7 TG: -Laser tag guns no longer give combat tech of 3.
-Cardborg Helmets and Cueball helmets no longer protect as well as sec helmets.
Reorganized the clothing/head.dm. PLEASE take note of the parent when making
child objects, people.
-Laser tag vests can now hold their matching laser tag guns.
-Harebells can now be harvested.
-Sprite for the new mini-extinguishers in the extinguisher closets. Needs
supporting code still.
-Added towel sprite to items.dmi.
Revision: r3582
Author: 	 d_h2...@yahoo.com
2012-05-13 00:56:53 +01:00
Erthilo ab552e20d1 TG: Renamed access_medlab to access_genetics.
Gave the RD his genetics access back.

Added Invisty's hyperspace tiles.
Added Icarus's map updates (Sec, gateway room, genetics/RD access) ((this is a
big overhaul to sec)).
Added Flashkirby99's SMES sprites.

Updated the changelog.
Revision: r3576
Author: 	 petethegoat
2012-05-13 00:24:34 +01:00
d_h2005@yahoo.com 4a3c9548d2 -New sound effects for circular saws and surgical drills.
-New sprites for mass-spectrometers and advanced mass-spectrometers.
-Sprites for empty bookshelves and book overlays added to library.dmi. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3585 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-12 21:59:39 +00:00
cib e408cad967 Fixed a bug where memes wouldn't be added to their host's parasite list. 2012-05-12 21:41:56 +02:00
SkyMarshal c43ee6dc57 Merge pull request #1037 from comma/master
Police tape overhaul
2012-05-12 12:28:41 -07:00
unknown 9efafd39bd Police tape overhaul
General purge of copypaste code

Framework for easier adding of new tape types
Now you only need two sprites of roll and sprites of tape length (H and V)
Define them in police_tape.dm

To show it off, engineering tape added, passable by engineers and atmos techs

Last but not least - ability to lift the tape, allowing passage for pretty much everything.
Done by those with access, attack by empty hand on help intent.
2012-05-12 22:16:23 +03:00
Erthilo aaa3e11993 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-12 16:42:54 +01:00
petethegoat@gmail.com 537e922249 Updated fire extinguisher cabinets- mini extinguishers now fit in them, and the path has changed!
/obj/structure/closet/extinguisher to /obj/structure/extinguisher_cabinet

Added Invisty's dragon dildo sprite
Updated the husk icons for carn


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3584 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-12 15:03:02 +00:00
SkyMarshal 15d72e3b0e Improves how gas mixture datums are handled, reduces proc calls, commenting. Removed ghost-heating from cryo and "oxygen_agent_b" gas type. 2012-05-11 18:02:30 -07:00
d_h2005@yahoo.com 7cc62d2e7e -Laser tag guns no longer give combat tech of 3.
-Cardborg Helmets and Cueball helmets no longer protect as well as sec helmets. Reorganized the clothing/head.dm. PLEASE take note of the parent when making child objects, people.
-Laser tag vests can now hold their matching laser tag guns.
-Harebells can now be harvested.
-Sprite for the new mini-extinguishers in the extinguisher closets. Needs supporting code still.
-Added towel sprite to items.dmi.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3582 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-12 00:36:32 +00:00
Erthilo 035bc3541f Fixes contraband and arts and craft crate. 2012-05-12 00:12:15 +01:00
Hawk-v3 fc2a7f3a81 More Breakroom things, and a second Json fix. 2012-05-11 18:47:00 +01:00
petethegoat@gmail.com bec8e2cf37 Renamed access_medlab to access_genetics.
Gave the RD his genetics access back.

Added Invisty's hyperspace tiles.
Added Icarus's map updates (Sec, gateway room, genetics/RD access) ((this is a big overhaul to sec)).
Added Flashkirby99's SMES sprites.

Updated the changelog.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3576 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-11 12:28:02 +00:00
johnsonmt88@gmail.com 6951ec37ed Committed for Sieve:
Reverted dismemberment
- This is the majority of the files

Reverted the gun change
- You wont shoot yourself putting your gun away
- You don't have to fire off all of your shots before hitting someone with your gun

Reverted Tarajans
- As requested

Hotfix for the Holodeck.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3574 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-11 02:21:00 +00:00
SkyMarshal 83b69a94b9 Merge pull request #1017 from Hawk-v3/master
HAWKMAPS (GASP)
2012-05-10 15:28:13 -07:00
Hawk-v3 c57476fcc7 HAWKMAPS(Gasp)
Shared Breakroom for Atmos, Engineering and Robotics. It's a proper den and has, to ENVY OF STATION, comfy chairs. And a recharger for borgbros.

Added updated armoury page.
2012-05-10 23:26:44 +01:00
CIB 232a3bacf9 Merge pull request #1016 from Erthilo/master
Mask changes, TG updates, sprites fixes, and custom items
2012-05-10 13:52:25 -07:00
Erthilo 50f5837ac6 TG: •Contraband supply packs now contain the DreadoryCobullshit cigarettes.
Pete, read the comments, the contraband crate is supposed to be a random-
assortment-of-goodies pack, and will gradually add more contraband to it.
Revision: r3573
Author: 	 polyxenitopalidou
2012-05-10 21:03:16 +01:00
polyxenitopalidou@gmail.com 98eca2a4a6 •Contraband supply packs now contain the DreadoryCobullshit cigarettes.
Pete, read the comments, the contraband crate is supposed to be a random-assortment-of-goodies pack, and will gradually add more contraband to it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3573 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-10 18:11:21 +00:00