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
SkyMarshal
582fe30ca8
Getting closer....
2012-01-04 23:04:55 -07:00
SkyMarshal
20cbc642e2
Another update.
2012-01-04 23:02:57 -07:00
SkyMarshal
873857690d
Unfinished commit with a few major changes. DO NOT MERGE.
...
Signed-off-by: SkyMarshal
2012-01-04 22:33:41 -07:00
CaelAislinn
75757a29cf
fixed conveyors. was something weird happening with antiqua, shouldn't be any changes
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-01-05 15:30:15 +10:00
Albert Iordache
08ab4448b8
Merge pull request #194 from Miniature/master
...
bunch of emlocker stuffs, also a couple of runtimes
2012-01-03 09:03:18 -08:00
Miniature
719c6a3b31
Don't ask me why this didn't work already, another runtime fixed
2012-01-04 03:22:07 +10:30
mport2004@gmail.com
f12301d51a
Fixed some runtimes.
...
Virus2 has been effectively removed from the code as it was not actually used and was causing some runtimes.
The PA is now properly affected by meteors/blobs/bombs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2903 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-02 22:12:36 +00:00
Tastyfish
3c15526e3f
accidentally called the wrong unequip proc, they're all so similar!
2012-01-02 12:52:09 -05:00
petethegoat@gmail.com
ee7cd1474e
TG update: Added corner conveyor belts.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2693 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-02 15:52:10 +02:00
VivianFoxfoot@gmail.com
bf56fc6e99
Doors no longer close if there is a mob in the tile, a door can be hacked/AI overriden to close anyways and injure that mob as well as knock them down so they can be crushed again and again until they stop moving. (Currently: 35 brute and knockdown.)
...
The server master log now records attacks / emotes / PDA messages, as well as timestamping.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2899 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-02 08:42:44 +00:00
CaelAislinn
c6fda41758
tweaked cargo bay conveyors
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-01-02 17:04:18 +10:00
mport2004@gmail.com
ec0cd3b973
Moved a batch of unchecked and a few unused files into the unused folder.
...
Remember if your scrolling though the list and something is unchecked it should almost certainly be checked.
Simple animals moved over to the actual mob code area and out of the defines.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2868 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-30 16:43:41 +00:00
heisen51@gmail.com
ef061ccca6
Most of the objects that should have been wrappable but were not wrappable are now wrappable. This includes beakers, syringes, syringe guns, revolvers and food.
...
If any more of such should-be-wrappable-but-is-not-wrappable objects are found, just put wrap(I, user) in the attackby proc.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2865 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-30 14:17:51 +00:00
heisen51@gmail.com
9c70500367
Fixed a missing disposal pipe section and APC in Fore Starboard Maintenance
...
Wrapped objects can now be labelled with a pen
Wrapped small packages can be picked up, and are now opened by being used on themselves.
Added a new disposal pipe part: The wrapsortjunction diverts disposalholders with a tomail value of 1. Disposalholders are given a tomail value of 1 only if they originate from a disposal unit with a package in it.
Package wrappers are now w_class = 4.0. This is to prevent bugs when wrapping containers.
Mail office remapped such that packages flushed down disposals end up on a special table.
Package wrappers placed in most of the station departments. Some of these may be removed in the future if unneeded.
Changelog updated accordingly.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2838 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-28 14:56:09 +00:00
Tastyfish
83ce12e7c3
disposal destructable, can develop disposal circuits now
2011-12-28 05:53:49 -05:00
SkyMarshal
28752b4410
Added disposals to detective's office, fixed more code.
2011-12-27 22:38:14 -07:00
SkyMarshal
a23024e211
Small map edit, reduced amount of air needed for disposals.
2011-12-27 21:13:12 -07:00
quartz235@gmail.com
706c20a15e
Atmos techs now spawn with extended capacity emergency tanks
...
AIs/Cyborgs can no longer drink from the toilet or wash themselves in sinks for the good of IMMERSION
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2836 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-28 02:08:33 +00:00
Albert Iordache
cfbb6eb704
Fixed a few errors.
2011-12-27 18:52:03 +02:00