Commit Graph

281 Commits

Author SHA1 Message Date
quartz235@gmail.com
0b8e1f62bb (hopefully) fixes a runtime causing the server to shit itself and crash immediately
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3190 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-25 04:02:24 +00:00
petethegoat@gmail.com
38e844dd2e Removed deathsposals as they looked silly, and added a new warning sign instead.
Fixed a couple of small bugs with the map.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3176 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-23 16:56:31 +00:00
SkyMarshal
99aa041f11 Fixed some bugs, map update for Antiqua.dmm 2012-02-23 00:13:34 -07:00
quartz235@gmail.com
d21a726006 -You can no longer package wrap intercoms
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3165 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-21 18:34:16 +00:00
petethegoat@gmail.com
afb645c764 Jetpacks can now use any gas.
The /obj/item/weapon/tank/jetpack path is now an empty jetpack, and oxygen and carbon dioxide filled jetpacks are /obj/item/weapon/tank/jetpack/blue_jetpack and /obj/item/weapon/tank/jetpack/black_jetpack respectively.

Added a new kind of disposal, the deathsposal (it's not called that in game). It's the same as a normal disposal, except it has a red rim to indicate that it leads to space.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3150 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-18 21:40:42 +00: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
petethegoat@gmail.com
f41b5cbabb Fixed projectiles going into disposals.
Made the rapid syringe gun a subtype of the syringe gun, and reduced it's capacity to four syringes.
Fixed the examine bug on syringe guns.
Added a new sprite for the regular syringe gun.

Added a new door for research. It's also used in robotics.

Updated the air injector sprite.

Fixed some pepperspray spelling errors.

~~REMOVED~~: the energy crossbow and chemsprayer from R&D.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3138 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-17 15:22:42 +00:00
baloh.matevz
10e0d8c259 - Added feedback logging for the disposal auto-flush to see if there is an absurdly huge amount of flushing going on which would mess with atmos.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3123 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-14 01:12:11 +00:00
baloh.matevz
d521357c06 - So apparently disposals were too hungry for air. They take far less of it now. They however still take the same amount of time to pressurize tho.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3118 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-12 23:18:28 +00:00
baloh.matevz
fe5b602a6f - Removed the table where mail gets to at mail sorting because mobs keep getting stuck there.
- You can no longer control disposal units from within them!
- Disposal units now auto trigger every 30 game ticks, if they are fully pressurized and if they have something (or someone) in them. So no more hiding in disposal units!
- Added this to the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3108 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 22:46:05 +00:00
baloh.matevz
aa3f28d3d6 Committing the one-way conveyor switches as posted by Donkieyo
http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=7759

They are currently present in the mail office.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3104 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 20:04:40 +00:00
SkyMarshal
429d13e980 Herp, derp made blood work right. 2012-02-05 11:22:05 -07:00
petethegoat@gmail.com
2c3c7c2c6b Added in throwing stuff into disposals, courtesy of SkyMarshal.
(technically this is a hotfix, as I accidentally committed it in r3036.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3037 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-05 17:40:12 +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
SkyMarshal
2074313f7f Updates to cigarettes and cigars
Tables can now be thrown past
You can now put something in a disposal unit by throwing at it.
2012-02-04 18:24:22 -07:00
SkyMarshal
16ac8ba8e0 Bugfixes. 2012-02-02 01:45:35 -07:00
Melvin Melonstorm
011a40cf91 Prevent delivery chute sound spam 2012-01-25 23:30:14 +01:00
Melvin Melonstorm
34c09891f6 Revert "Prevent the delivery chute from spamming the chute sound when several objects are flushed simultaneously."
This reverts commit a356550d1b.
2012-01-25 23:28:39 +01:00
Melvin Melonstorm
a356550d1b Prevent the delivery chute from spamming the chute sound when several objects are flushed simultaneously. 2012-01-25 23:03:31 +01:00
Albert Iordache
725ec31a57 Merge pull request #278 from caelaislinn/master
Fixed disposals error from using a grab on a disposal chute.
2012-01-13 11:52:53 -08:00
CaelAislinn
07fb3f1eb8 fixed error from using a grab on a disposal chute
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-13 21:51:16 +10:00
Albert Iordache
e3c4b0f88f Merge pull request #276 from SkyMarshal/master
Weldpack added, not on map; Clipboards fit on belt; Wrapping is more robust.
2012-01-12 11:43:39 -08:00
SkyMarshal
70cb3417ef Added weldpack, clipboards fit on belt, food and other things can now be wrapped 2012-01-12 11:13:05 -07:00
CaelAislinn
47451d9f53 conveyors in the mini outposts on the mining asteroid should now work properly
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-12 16:59:36 +10:00
Tastyfish
a85e8eee50 Merge pull request #271 from caelaislinn/master
conveyors on the mini mining outposts should now work properly
2012-01-11 23:03:00 -08:00
SkyMarshal
a47b399c32 Fixed bugs involving wrapping yourself in a closet. Added a new centcom uniform sprite, and added checks to keep them looking pretty. Added a cancel button to deathsquad button. Adjusted admin spawnable complete uniforms, so that centcom officials look pimp'n. Added a layer of internal armor (special invisible exosuit) that spawns on centcom officials. Centcom berets are no longer space helmets. Added missing reactive teleport armor sprite and fixed it's functionality. 2012-01-11 18:13:02 -07:00
Tastyfish
f922994c71 Merge remote-tracking branch 'upstream/master'
Conflicts:
	code/modules/recycling/sortingmachinery.dm
2012-01-11 00:26:42 -05:00
Tastyfish
12a9c075c8 added overlays for labelled and tagged packages 2012-01-11 00:24:02 -05:00
Tastyfish
f404ea91d6 Merge pull request #260 from SkyMarshal/master
Disposal updates + map fix, traitor objective fix, Cult teleport talisman now teleports grabs
2012-01-10 20:38:14 -08:00
SkyMarshal
3b57d309cc Disposals are now much more robust, with sorters being program-able, food able to be packaged, people able to flush closets, proper construction of sorters, and a function on taggers to use a custom tag.
In addition:
Made teleport talismans more amusing.
Fixed duplicate traitor objectives.
2012-01-10 21:21:52 -07:00
SkyMarshal
f36c56f5c7 Disposal updates, fixed a messed up maintenance door. 2012-01-10 15:37:42 -07:00
Miniature
d5fc419a0d Merge pull request #256 from Miniature/master
fix runtimes in disposals pipes and seed making for a plant
whoever coded this should be shot
2012-01-09 16:28:31 -08:00
Miniature
225b2ad03e fix runtimes in disposals pipes and seed making for a plant
whoever coded those parts should be shot
2012-01-10 10:56:58 +10:30
SkyMarshal
25426e6f02 Merge pull request #254 from SkyMarshal/master
Bugfix.
2012-01-09 09:08:53 -08:00
SkyMarshal
e455f46cfd More bugfixing 2012-01-09 10:08:11 -07:00
SkyMarshal
46fb684c0b Bugfix for chem grenades and Disposals. 2012-01-09 09:58:33 -07:00
Tastyfish
1d010aca75 Merge remote-tracking branch 'upstream/master' 2012-01-08 20:06:03 -05:00
SkyMarshal
3c128170a3 Shit to update 2012-01-06 16:50:19 -07:00
Tastyfish
ffe6ac7935 Merge remote-tracking branch 'upstream/master' 2012-01-06 16:41:52 -05:00
Tastyfish
c4f5429857 furthur work on bones 2012-01-06 16:41:47 -05:00
SkyMarshal
240153a8a5 Genetics is no longer a fortress, fixed some disposals silliness. 2012-01-06 13:17:17 -07:00
SkyMarshal
68070d9061 Bugfixes for cloning and the mail sorting machinery. 2012-01-06 11:38:56 -07:00
SkyMarshal
7872eeafc1 Cloning now works right from any and all consoles.
Make the mail management less buggy and more robust.
2012-01-05 21:50:20 -07:00
SkyMarshal
5bd517bf72 Numerous fixes. 2012-01-05 14:33:29 -07:00
SkyMarshal
89df766f75 Finial stuff for the mail sorting shit. 2012-01-05 10:22:17 -07:00
SkyMarshal
98fc5872d3 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-01-05 09:45:20 -07:00
SkyMarshal
421b49c3f0 Reworked some stuff to actually... work 2012-01-05 09:39:44 -07:00
Albert Iordache
778c6d03e3 Merge pull request #218 from SkyMarshal/master
Big edit!
2012-01-05 07:56:30 -08:00
SkyMarshal
dd5c6b9250 Final fix, I think. 2012-01-05 01:02:44 -07:00
SkyMarshal
0f92684f8a Hopefully final commit. 2012-01-05 00:04:42 -07:00