cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-15 03:23:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,293 Commits 8 Branches 26 Tags
a7a42410ecb68d1cdf79aeaea5fb85aa440cfa5a
Commit Graph

820 Commits

Author SHA1 Message Date
SkyMarshal
3be149b2b3 Fixes discussed on IRC. Fixed a broken sort junction I miseed. (Thanks tasty!) 2012-01-05 15:44:28 -07:00
Albert Iordache
53d989dda2 Merge pull request #224 from CIB/master 
Medical stuff
 2012-01-05 12:22:19 -08:00
cib
9e035424da Nerfed the medbot and bruise packs. 2012-01-05 19:36:26 -08:00
SkyMarshal
fbd4004781 Merge pull request #223 from SkyMarshal/master 
Bugfix/tweak
 2012-01-05 09:33:42 -08:00
SkyMarshal
86b42f815f Tweaked garble-ness on radios in other Z-levels 2012-01-05 10:31:42 -07:00
cib
1f9797934e Made the explosionfar sound occur more often. 2012-01-05 17:39:13 -08:00
SkyMarshal
b2e25d39b8 This should work, not sure. 
Signed-off-by: SkyMarshal
 2012-01-04 11:08:47 -07:00
Albert Iordache
33833b9acb Merge pull request #202 from SkyMarshal/master 
OHMYGOD I coded a ton.
 2012-01-03 11:14:20 -08: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
8aba29cc9c Fixing some null runtimes 2012-01-04 03:15:20 +10:30
Miniature
9a81f4496b Finished emlocker stuff 
if someone wants to move where the spawning is done feel free
 2012-01-04 02:15:38 +10:30
SkyMarshal
9a651a5a84 Added psyche jumpsuit for Asanadas 
Expanded scrambled radio stuff.
 2012-01-03 00:06:25 -07:00
SkyMarshal
411ccc4075 Shitload of stuff. 2012-01-02 21:48:42 -07:00
SkyMarshal
fbf59a3411 Fix compile error. 2012-01-02 10:08:30 -07:00
SkyMarshal
2f0a745815 PDAs can now fit into all belts. 2012-01-02 10:01:57 -07:00
Tastyfish
bf877d0483 Merge pull request #191 from SkyMarshal/master 
Nuclear revamp, full details in description.
 2012-01-02 08:18:25 -08:00
Miniature
806a8d1c1a First bunch of emlocker stuffs, going to fix when its not 1am and 24C 2012-01-03 01:38:01 +10:30
Albert Iordache
d9683ef4e3 Merge pull request #192 from caelaislinn/master 
Autolathe changes, new supply crates, slight cargo bay tweaks
 2012-01-02 06:36:03 -08:00
CaelAislinn
fe228850c8 Added old BS12 walllockers and emergency lockers, added emergency lockers to tgstation208.dmm, removed stamp eraser from supply crate, minor antiqua tweaks 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-02 23:47:28 +10:00
CaelAislinn
9fa489a0d1 finished autolathe changes. added stationary, box and empty supply crates to supply shuttle. 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-02 21:38:27 +10:00
CaelAislinn
083de044f3 Added production quantities and the ability to load + fill containers to the autolathe. 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-02 20:19:15 +10:00
SkyMarshal
b30da1fa98 Some fixes and improvements. 2012-01-01 22:29:04 -07:00
SkyMarshal
d64e8284f6 Fixed implanter problems, added some more silly emotes. 2012-01-01 19:57:57 -07:00
SkyMarshal
d2bae46c39 Changed functionality of implanter. 2012-01-01 19:25:02 -07:00
SkyMarshal
755d2d711a Nuke revamp, some tweaking. 2012-01-01 18:58:28 -07:00
Tastyfish
343832e431 made it so nar-sie can't be objective if < 10 players, due to it being impossible 
also, made piano moveable
and cleaned up custom vote code slightly more
 2012-01-01 16:44:57 -05:00
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
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
Albert Iordache
977b37abde Fixed a runtime error. 2011-12-31 14:49:35 +02:00
SkyMarshal
1c54c8b20f Bugfix for alien removal surgery 2011-12-30 19:03:29 -07:00
cib
df4419da1e Changed the genetics manual. 2011-12-30 19:43:01 -08: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
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
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
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
SkyMarshal
22d5d2cd3d Small error with the new traitor item. 2011-12-28 23:23:42 -07:00
SkyMarshal
cc3bc60963 Alien removal surgery, new traitor item, other stuff. 2011-12-28 23:15:30 -07:00
SkyMarshal
43c2285a93 Fixes and stuff. 2011-12-28 14:27:52 -07:00
Tastyfish
f1fcbf3445 can set the paint scheme of doors! 2011-12-28 03:22:59 -05:00
Tastyfish
f378644bb0 constructable/destroyable lights! 2011-12-27 22:13:18 -05:00
SkyMarshal
08ff9b06e7 Fixed several things. 2011-12-27 13:44:52 -07:00
Albert Iordache
9219a22f14 Merge branch 'master' of https://github.com/SkyMarshal/Baystation12 into Sky 
Conflicts:
	maps/tgstation.2.0.8.dmm
 2011-12-27 17:08:52 +02:00
Albert Iordache
2092e25983 Merge pull request #147 from Tastyfish/master 
coats, changeling, piano, also admins can delete books, paper/books more robust against dynamic content, custom votes
 2011-12-27 04:26:51 -08:00
SkyMarshal
607db09620 Lotsa stuff. Map update. 2011-12-26 17:59:09 -07:00
uporotiy
ab396f50ac TG update: Added stun, weaken and paralysis-related procs in place of directly editing the vars. Hulk is 5% chance now due to being completely immune to any sort of stunning (will nerf more later). Think that's all but not entirely sure. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2683 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 23:39:45 +02:00
Albert Iordache
ef0a9b3632 TG update: Added Reactive Teleport armour and on/off sprites for the armour. Click in hand to toggle on/off (like a cloaking device). When worn and activated, successfully blocked attacks will cause the wearer to warp randomly up to 8 tiles. EMPs will disable it. Values may need tweaking to balance the armour. One set now spawns in the RD's office to it will get used/tested, depending on how that goes I may move it to being produceable by the protolathe only, or remove it entirely etc 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2680 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 23:30:34 +02:00
petethegoat@gmail.com
e87ca09537 TG update: Tiny fix for table disassembly. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2677 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 20:34:50 +02:00
Albert Iordache
1fac967212 TG update: Added the (almost finished) displacer. One minor bug with it to work out, does not actually spawn anywhere though so it shouldn't effect anything. Will try to finish it later tonight. 2011-12-26 20:30:45 +02:00