Commit Graph

17074 Commits

Author SHA1 Message Date
Albert Iordache 47ada174be Merge pull request #182 from Tastyfish/master
Toggle-Deny-Shuttle, can build fire alarms, atmos alarms, status displays and light switches
2011-12-31 11:38:31 -08:00
rockdtben 51edbc649a Moved a proc from mob_defines to mob_cleanup going to be implementing organstructure soon and needed to clean the workspace.
mob_cleanup.dm will hold procs that are dirty and need to be written in a cleaner matter. (No insult to original writers)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2885 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-31 17:58:56 +00:00
Tastyfish c02979c148 Toggle-Deny-Shuttle, can build fire alarms, atmos alarms, intercoms, status displays, and light switches 2011-12-31 12:28:26 -05:00
panurgomatic 3c3a2e6cfd - Nerfed Exosuit Syringe Gun construction cost.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2883 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-31 16:06:03 +00:00
Albert Iordache 977b37abde Fixed a runtime error. 2011-12-31 14:49:35 +02:00
Albert Iordache 18e6242dc8 Merge pull request #181 from Tastyfish/master
fixed derp on vote announcement for custom vote
2011-12-31 02:55:46 -08:00
Tastyfish a561862ef0 and there too 2011-12-31 01:51:06 -05:00
Tastyfish 2f6fc64353 admins cna see who set custom event now. 2011-12-31 00:35:44 -05:00
Tastyfish c654a3d8d8 fixed derp on vote announcement for custom vote 2011-12-30 23:41:06 -05:00
petethegoat@gmail.com 1a64dcb09f Added AruAnorr's mech cable layer sprite.
Cleaned up some stray transparent pixels around the disposal pipe sprites.
Slightly modified the janitor's mop bucket sprite. Maybe it'll look a little less shit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2882 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-31 03:40:13 +00:00
CIB a16c53ce7a Merge pull request #180 from SkyMarshal/master
Bugfix for alien removal surgery
2011-12-30 18:13:54 -08:00
cib 3a20da81aa Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-31 02:14:28 -08:00
cib efcd5c29a9 Fixed the hunger symptom which was still using BS12's system. 2011-12-31 02:13:02 -08:00
cib f7be1250a3 Many improvements to vira.
Implemented an efficient system for infection. Made sneeze and cough increase infection chance. Increased the lifespan of spaceacillin in a host. Removed the drool symptom.
2011-12-30 21:07:52 -08:00
cib df4419da1e Changed the genetics manual. 2011-12-30 19:43:01 -08:00
SkyMarshal 1c54c8b20f Bugfix for alien removal surgery 2011-12-30 19:03:29 -07:00
Albert Iordache 39b6dd57e0 Removed and commented out the last traces of goon auth. code 2011-12-30 23:28:14 +02:00
mport2004@gmail.com ab6a7a541a PDAs now give a message when you add your ID.
Engineering has a new layout, might need a slight amount of work but seems to function.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2880 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-30 21:14:22 +00:00
ryantennessee@yahoo.com eeacea2626 A mass of small things.
Most notable, removed an assload of windows throughout engineering.  Removed CE reception desk and replaced with Rwalls.
Moved around a bit of stuff on the CE desk.  Moved some desks at singulo observation.
added a set of two power monitors in CE office.
added two coils of wire in engineering storage (not secure storage).
Moved the emergency closet near engineering reception desk.  Added a second emergency closet.
Moved some vending machines.
Mass modified electrical wiring near engineering.
Mass modified atmos piping near engineering.
Replaced tables in SMES room with a set of two power monitors.
Other stuff I don't remember.  Easter egg hunt!

Also put back fullbeackers wihs was accidentalyl removed.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2879 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-30 21:10:32 +00:00
rockdtben 568bda9ec1 Relocated mob defines to the modules folder
Previous commit and this one.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2878 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-30 19:49:15 +00:00
rockdtben 19c06c9cd8 git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2877 316c924e-a436-60f5-8080-3fe189b3f50e 2011-12-30 19:47:13 +00:00
SkyMarshal 648199a82f Remove clown/mime costume crate, after a HoP went and started derping around with it. 2011-12-30 11:00:02 -07:00
rockdtben 938fc1e0f0 toxloss is now only referenced via procs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2875 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-30 17:59:19 +00:00
rockdtben 5b691f8727 brainloss is now only referenced via procs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2874 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-30 17:47:35 +00:00
rockdtben 3029c0d58c cloneloss is now only referenced via procs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2871 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-30 17:28:21 +00:00
mport2004@gmail.com 67efff9bae Apparently organs are being worked on.
They have been moved back and checked for Rockdtben.
As the attempted list dead people's names as their real_name did not work, dead people's names are back to the old style.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2869 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-30 17:09:02 +00: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
SkyMarshal 0fe2cdab96 Added multiple string search to security records, fixed some evidence bag bugginess, fixed problem with the stamp remover. 2011-12-30 09:15:04 -07:00
mport2004@gmail.com 4ad793af53 Emitters can be emag'd.
You need to swipe and ID to lock an emitter,
PDAs will no longer have a popup when you attempt to put an ID into them.
PDAs have an Update Info button just below the ID slot when an ID is in it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2867 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-30 15:42:17 +00:00
VivianFoxfoot@gmail.com a2c78cbbd0 Fixes a mixup with the low pressure light.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2866 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-30 15:06:14 +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
quartz235@gmail.com 5f404cdcdb fix for ckeyed simple_animals not showing up in the player panel
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2864 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-30 13:42:48 +00:00
VivianFoxfoot@gmail.com 3d952af665 Adds a pressure indicator to the HUD. Decreases the pressure required for damage to occur to 750, added stepping damage.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2861 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-30 07:51:42 +00:00
quartz235@gmail.com 46280aa5f0 I am making the grammar of this game better one file at a time.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2860 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-30 06:31:13 +00:00
Albert Iordache ea92743b36 Merge pull request #173 from CIB/master
Fix stupid bug with trauma/cryo
2011-12-29 13:12:49 -08:00
cib d8ec1ae26b Fixed traumatic shock breaking cryo. 2011-12-29 22:09:36 -08:00
cib d4c3053372 Increased the chance of getting infected significantly, with the current system it's too low. 2011-12-29 16:50:20 -08:00
cib b5f8c930f1 Revert SkyMarshal's last commits since they don't even compile, which means they weren't tested.
Revert "Alien removal surgery, new traitor item, other stuff."

This reverts commit cc3bc60963.
2011-12-29 15:15:51 -08:00
SkyMarshal e12469aed9 Quick fix, and a fix for whispering.
Signed-off-by: SkyMarshal
2011-12-29 10:23:00 -07:00
rockdtben 8c45454bc2 Move all of my procs from the mob defines file to the mob modules folder.
Added a proc to get and set dna.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2859 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-29 17:18:36 +00:00
SkyMarshal 5ab20fdf55 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Conflicts:
	code/game/objects/items/weapons/papers_bins.dm
	code/game/objects/items/weapons/uplinks.dm
2011-12-29 10:08:58 -07:00
SkyMarshal 9ad0bc5c89 Can compile, now. 2011-12-29 10:01:19 -07:00
Tastyfish f3145486cc Merge remote-tracking branch 'upstream/master' 2011-12-29 08:38:42 -05:00
Tastyfish 8745b6bd40 pAI chatbot pal for when ghost aren't pAI'ing;
borgs can't move when no charge;
fixed misplaced light in RD office
2011-12-29 08:38:40 -05:00
CIB 6fbe9cb7bf Merge pull request #167 from SkyMarshal/master
*sigh* Check the description
2011-12-29 05:23:24 -08:00
CIB b7349e7fa1 Merge pull request #166 from CIB/master
Improved on medical a little, adding traumatic shock
2011-12-29 05:21:52 -08:00
heisen51@gmail.com 53ffa4f39b Reverted pokeballs ;_;
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2857 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-29 13:06:33 +00:00
cib 44b32385a6 Removed sleep symptom from lesser diseases, made the cure research machine display the antibodies of the given sample of blood. 2011-12-29 01:59:43 -08:00
heisen51@gmail.com e6f6b5b821 Changed the pokeball summoning message a teensy bit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2856 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-29 09:21:07 +00:00
heisen51@gmail.com 300f16cd65 Added pokeballs. Sadly, adminspawn-only for now.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2855 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-29 09:11:02 +00:00