Commit Graph

1296 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Erthilo
5b52e2ce64 TG: -Emergency Toolboxes now contain smaller, lighter fire extinguishers that
actually fit inside them!
Revision: r3568
Author: 	 d_h2...@yahoo.com
2012-05-10 02:52:05 +01:00
Erthilo
f484bdfb52 TG: Minor cigarette fixes, and added the DromedaryCo cigarette crate as a new
contraband crate.
Also added WJohnston's new rolled up poster sprite.
Revision: r3566
Author: 	 petethegoat
2012-05-10 02:47:23 +01:00
Erthilo
ad95edc954 TG: Wraiths now have their own jaunt animation, courtesy of Ausops.
Revision: r3551
Author: 	 kortgstation
2012-05-10 01:49:04 +01:00
Erthilo
721eaefee1 Changes balloon description. It's just a balloon damnit. 2012-05-09 00:29:17 +01:00
Erthilo
76f88da735 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates 2012-05-08 18:28:05 +01:00
CaelAislinn
bd86b7236f fixed some weird merge issues
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-05-08 15:43:41 +10:00
Erthilo
9cad6dfa39 Reverts one decal per tile code due to it breaking a few blood things. 2012-05-08 00:35:09 +01:00
d_h2005@yahoo.com
f2dba4a5aa -Emergency Toolboxes now contain smaller, lighter fire extinguishers that actually fit inside them!
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3568 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-07 23:03:57 +00:00
petethegoat@gmail.com
6e2c65183b Minor cigarette fixes, and added the DromedaryCo cigarette crate as a new contraband crate.
Also added WJohnston's new rolled up poster sprite.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3566 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-07 16:45:08 +00:00
Erthilo
026074d6c5 TG: (Might very possibly be broken. Didn't port most of the stuff due to it having been rewritten. - Erthilo)
Adds BS12 dismemberment.  Not all features of it are implemented yet, but it
should be equal to our previous system.
Adds greater changeling code, but doesn't change the genome count yet on it.
Renames registered to registered_name on IDs because bs12 had it and it seemed
like a good idea to do last night.  For some reason.
Adds an afterattack to mobs that can be used.  (In fairness, lots of shit in
attack_hand should be in there instead, like stungloves and stuff, to minimize
duplicated code)
Revision: r3537
Author: 	 VivianFoxfoot
2012-05-06 22:53:39 +01:00
Erthilo
53d03a49b6 TG: -New black pressure tanks sprites, at the behest of Petethegoat,
-Uploading Invisty's backpack storage message tweak.
-New plant mutation for blue-tomatoes: Blue-space tomatoes.
Revision: r3527
Author: 	 d_h2...@yahoo.com
2012-05-06 19:26:00 +01:00
Erthilo
f2777aa65f TG: Tonnes of stuff, please check the changelog.
In short: massive updates to security, the library, hydroponics, the kitchen and
the bar, by Flazeo and Ikarrus
Massive updates to the PA, with Invisty's new sprites, done by Sieve
New sprites for field gens too, also by Invisty
Borg and battery updates by Sieve
Fake gloves by Sieve
I messed around with some pressure_resistance stuff on Dumpdavidson's suggestion
(only in paperwork)

PROBABLY A BUNCH OF OTHER SHIT
Revision: r3505
Author: 	 petethegoat
2012-05-06 18:26:41 +01:00
Erthilo
5eddc86f6b TG: Added Wjohntsons little toy mechas.
Removed restrictions for cultists, anyone can be converted now.

Bibles no longer deconvert cultists to stop the random bible smashing from
ruining rounds

Soulstones can no longer capture the manifested ghosts. No more infinite
constructs.

Removed the telecomm traffic control from the map until its fixed.
Revision: r3500
Author: 	 kortgstation
2012-05-06 00:51:43 +01:00
Erthilo
2a837c9a26 TG: Quick fix for the ballistic gear crate, it now has the correct shotgun path.
Revision: r3496
Author: 	 petethegoat
2012-05-06 00:36:46 +01:00
Erthilo
d75bb980f2 TG: -Added chawanmushi recipe and beet soup recipes. Added a trash plate to metroid
sammiches.
-Ambrosia vulgaris now has a mutation.
-Added 1% chance for a species mutation whenever a plant's stats mutate.
-You now get more descriptive messages when applying mutagen to plant trays.
-Removed sugarcane seeds from the vending machine. They were redundant and had
poor sprites and no recipes. Added the seeds to the seeds crate so you can still
get them, if you really want to...
Revision: r3460
Author: 	 d_h2...@yahoo.com
2012-05-05 23:50:34 +01:00
Erthilo
a83c870358 TG: -Added soil to plant seeds in. Make it by crushing up sandstone. Soil does not
have indicators like trays do! Watch your plants carefully!
-Added money trees. When life gives you lemons, mutate them into cash.
-RnD can create a new tool for botanists: The floral somatoray. Has two modes.
Use it on your plants to induce mutations or boost yield.
-Raised the passive species-mutation chance slightly.
-Fixed a goof I made before when I was editing poppies. Woops.
-Changed the name of "Generic Weeds".
-Normalized grass harvests.
-Couple of typo fixes.
-Updooted my changelog.
Revision: r3495
Author: 	 d_h2...@yahoo.com
2012-05-05 23:45:45 +01:00
Erthilo
301fe9cd01 TG: - you can now only have ONE decal of blood per tile. This is to fix the millions
of blood effect items that spawned to lag anyone who right clicked them. The
most recently created blood item will be the one that remains. This does not
effect gibs.
Revision: r3490
Author: 	 baloh.matevz
2012-05-05 22:51:47 +01:00
Erthilo
be7d01fcb7 TG: - Added a 'random coloured' wire type, which gets it's color assigned only once
created.
- Added the tool vending machine to code. Sprites by... I forgot...
http://i.imgur.com/yedWM.png
Revision: r3472
Author: 	 baloh.matevz
2012-05-05 21:51:16 +01:00
Erthilo
afd33125ab TG: - hand tools now fit on your belt slot
- added feedback logging for newscasters
- added feedback logging for admin verbs
- added shuttle timers to escape pods
- added feedback logging to chemical reactions
- clipboard can now fit on your belt
Revision: r3465
Author: 	 baloh.matevz
2012-05-05 21:34:34 +01:00
CIB
00d227ea16 Merge pull request #974 from caelaislinn/master
releasing maplock for erthilo to merge antiqua changes.
2012-05-05 02:47:35 -07:00