455b61d9c8
hand labelers have been broken since the first commit..
2011-12-07 00:32:02 -05:00
14f0a4d0b9
UnRevert "the closet tg merge broke my charge crates"
...
This reverts commit 2694238e88
2011-12-06 21:04:41 -05:00
ecb6f2b2d6
Revert "the closet tg merge broke my charge crates"
...
This reverts commit 2694238e88
2011-12-06 21:00:08 -05:00
ac627aa521
Merge branch 'master' of github.com:Tastyfish/Baystation12
2011-12-06 20:36:20 -05:00
2694238e88
the closet tg merge broke my charge crates
2011-12-06 20:35:07 -05:00
d1f2c54b17
(forgot one file, but also sending the log from the previous commit)
...
Command intercept will now only increase the security level if it's lower than blue
Added a keycard authentication device. When you interact with it it asks you which event you'd like to trigger, currently only "Red alert". When you select the event, it asks you to swipe your ID card. If you have the new keycard auth access (60) on it (all heads of staff do), it will trigger all other devices of the same type to flash for 2 seconds. If someone with the same access level on their card swipes their card on another device during this period, the event will happen.
The idea behind this is the two key idea from submarine movies - just with ID cards. Admins are informed who requests the event and who triggers it btw, so abusing this is a bad idea.
Added this to the changelog. Hopefully the dme will work properly this time.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2635 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-07 00:55:20 +00:00
810dbd7346
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2634 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-07 00:53:09 +00:00
73aa4a1afa
hotfix for comms console locking up when you try to change the alert level...
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2632 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 22:43:15 +00:00
8636f28d7d
In response to the problems of miner inactivity and a suspicion of the steel change affecting robotics in that mechs, specifically ripleys will no longer be built, I have included some stats logging about mecha construction and mineral production.
...
Also made steel and reinforced glass correctly decrease ore amounts.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2631 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 22:33:23 +00:00
af301633f6
Merge branch 'master' of git://github.com/Abi79/tgstation13-git
...
Conflicts:
baystation12.dme
code/defines/obj/vending.dm
code/game/machinery/vending.dm
html/changelog.html
maps/tgstation.2.0.8.dmm
2011-12-07 07:53:20 +10:30
5fec6c6319
DM why you so shit
2011-12-07 07:46:08 +10:30
92045315a3
Merge pull request #72 from Strumpetplaya/master
...
Security now has maintenance access.
2011-12-06 09:46:00 -08:00
9dc2644e51
Commented out more of the fat code, for issue #71 .
2011-12-06 19:23:25 +02:00
6a62c3b8ff
Merge pull request #71 from SkyMarshal/master
...
Removed obesity upon overeating
2011-12-06 08:48:06 -08:00
df04d75c48
Aaaaaaaaaand once again I forget to upload a new file.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2629 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 15:04:11 +00:00
cb19629c18
Wrenches no longer spawn with a random pixel offset to the right.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2628 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 14:39:19 +00:00
a6e7d09620
Moved the singularity and particle accelerator a bit out of the station. Added some stuff to engineering and generally organized it a bit.
2011-12-06 05:24:43 -08:00
508df5d3cb
Nobody spawns with internals anymore.
2011-12-06 07:35:33 -05:00
4489db546d
Added detective stuff - fibers.
...
Left out bloody footprints for now. Not sure we want that with the
current system of corpses dropping blood spatters all around when dragged.
2011-12-06 07:12:19 -05:00
bbd04aa2aa
Security now has maintenance access.
...
Security also has access to medical/research hallways.
Assistants no longer have maintenance access.
2011-12-06 06:04:34 -05:00
68b1be773a
Removed fatness from overeatting
2011-12-06 02:47:50 -07:00
4764cdc990
Aliens:
...
Reworked the code to use a new "plasma" var instead of toxloss for their powers.
Facehuggers are now active for 30 to 60 instead of 3 to 5 seconds.
Aliens can see whether facehuggers are active without needing to examine them.
Changelings:
Ranged sting is now 2 squares-ranged instead of 3 squares.
Space:
Reverted the randomly accessible z-levels back to how they were (derelict and ai sat).
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2627 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 08:30:03 +00:00
139252dbda
made me accept v/h in form of "me v waves."/"me h shouts!", fixed v/h types of robot emotes, added *help for robots
2011-12-06 00:30:07 -05:00
07dac128c1
Gyrojet bolts now explode on contact with mobs and walls.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2626 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 04:50:42 +00:00
68c6b97fd3
everyone cult!, paper label
2011-12-05 23:19:39 -05:00
1657e3a9dc
Changing portable air pump volume from 750 to 2500 (3.33 x current).
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2625 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 01:28:28 +00:00
571ee5f3de
fixed Load Slot Close button
2011-12-05 14:33:18 -05:00
dc3ada7c27
Merge pull request #66 from Miniature/master
...
AI freelook stuff - should work perfectly now
2011-12-04 21:45:13 -08:00
a7b2110194
AI freelook stuff - should work perfectly now
...
Urist said that /tg/ people got some runtime errors, I have no idea what they got and I haven't got any errors in testing so yeah.
2011-12-05 15:08:52 +10:30
80c40ada96
Merge pull request #65 from Tastyfish/master
...
fixed my ooc color derp
2011-12-04 20:06:59 -08:00
99407ea862
fixed me ooc color derp
2011-12-04 23:00:16 -05:00
414cfbe8c1
Uncommented erro's code, reticked erro's code.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2620 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-05 02:02:35 +00:00
025288d4eb
Commenting out erro's broken code until he fixes it so no compilation errors
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2619 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-05 01:48:48 +00:00
cd6bdc968e
Merge pull request #64 from Tastyfish/master
...
let admins (space) change ooc color, fixed cryo in tgstation map post-merge
2011-12-04 15:56:19 -08:00
84b471361e
let admins (space) change ooc color, fixed cryo in tgstation map post-base merge
2011-12-04 18:52:47 -05:00
ec2456a1f0
Merge pull request #60 from Tastyfish/master
...
borgs go beep and janitor borgs can OCD, charge ordering bug fix, flavor text
2011-12-04 15:31:07 -08:00
44c0cfc46d
-Adding pepper spray for security officers.
...
-Fixed a storage bug for chemsprayers and space cleaner
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2618 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 22:42:18 +00:00
e4afa60af2
Accidentally removed a line when I was fixing gun recharge rates.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2616 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 21:40:31 +00:00
962919f6e0
- Added the ability to communications computers to switch between the blue and green security levels. I wanna make a super special way to get to the red level, which involves the turning of multiple keys (id cards) in multiple areas :)
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2615 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 20:32:30 +00:00
c208332942
added Anchorshag's examination flavor text thingy
2011-12-04 15:26:46 -05:00
430cca3300
(GIVE POLYBLUE COMMIT ALREADY) Headrevs can no longer be borged, and revs who get borged are dereved.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2614 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 19:55:01 +00:00
5b15848a07
Made pAIs tell candidates who is requesting.
2011-12-05 04:13:17 +10:30
5543fe749f
Animals as captains? Human supremacy!
2011-12-05 01:34:36 +10:30
a3e7e394ad
Switched charge amounts for automatically turning off machinery and lights, so lights turn off before machinery (like on old code).
2011-12-04 22:52:20 +10:30
793d4051e2
security levels commit oddities fixed.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2611 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 10:25:03 +00:00
58b573ceec
Committing grenade fix
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2610 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 10:17:13 +00:00
02132f4ebf
Added grenade launcher, one in the armory with the rest of the riot gear. Capable of holding three grenades at a time. Also, one box of flashbangs in Security, another in the firing range, and two extra pairs of glasses (not HUDglasses) in the firing range.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2609 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 09:47:19 +00:00
145625b699
Cleaned up some more sounds and prepped ambistat.ogg and ambibar.ogg for their future as title music
...
(For PolyBlue) Flashbangs now affect people in lockers
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2608 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 08:45:39 +00:00
a2d6e59f18
Security levels commit 2
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2607 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 06:50:37 +00:00
9375c09666
security levels commit 1
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2606 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 06:49:59 +00:00
Tastyfish