cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-18 13:02:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,489 Commits 8 Branches 26 Tags
e201bcbe0e9bd57e83af02e4e70c8a4e5a1d5014
Commit Graph

1710 Commits

Author SHA1 Message Date
SkyMarshal
e201bcbe0e fixed a derp in ion storm laws. Conflicted with NT laws. 2012-01-20 17:06:23 -07:00
SkyMarshal
94c38b8206 Fixed book titles not showing up properly in some instances, Death alarm is now labeled as such, robot lighter works right. 2012-01-20 16:40:55 -07:00
SkyMarshal
a08f21f36f Fixed typo2 2012-01-20 12:57:44 -07:00
SkyMarshal
12c6564e32 Fixed Typo1 2012-01-20 12:57:13 -07:00
SkyMarshal
cd5f8dd0b5 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-20 12:53:43 -07:00
SkyMarshal
1bf1d5db1f Pimped out the response team. No jobs have stupid stuff spawn in their hands, it now spawns on their person, be it on their ear (pens if they cannot find a target) of in their pockets. MAde several pre-set-up things for the response team, including portable surgery equipment and a movable optable. Made autolathe items spawn on top of it. Added Death alarms, and made explosive implants work properly. Girders are now removed when a floor is made/RCD'd into existence. Internals can now be set even if it is in suit storage or on the belt. 2012-01-20 12:53:29 -07:00
Albert Iordache
495d9249da Merge pull request #297 from Tastyfish/master 
added 4-way manifold, t-valve (like a railroad switch)
 2012-01-20 03:12:54 -08:00
Tastyfish
d1a9a254ef Merge remote-tracking branch 'upstream/master' 2012-01-19 23:45:14 -05:00
Tastyfish
e84e6cfd50 added 4-way manifold, t-valve (like a railroad switch) 2012-01-19 22:04:50 -05:00
CaelAislinn
143d3daeba Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-01-20 00:53:49 +10:00
CaelAislinn
d9b1d95a70 fixed autolathe queueing bug 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-20 00:51:40 +10:00
Tastyfish
51780a5c05 Merge pull request #291 from SkyMarshal/master 
Radio and map update.
 2012-01-18 23:16:15 -08:00
SkyMarshal
18bd946668 Finally fixed the access stuff for medbay. It was a bug introduced by Doohl. 
Also made electric chairs amazing, but the sprite needs work.
 2012-01-19 00:12:24 -07:00
Tastyfish
7737c5b50c Merge pull request #288 from CIB/master 
Blobs need oxygen now
 2012-01-18 20:55:58 -08:00
SkyMarshal
d0e8ceec58 Bugfix for access problems. 2012-01-18 11:48:37 -07:00
SkyMarshal
bd97d9cdfd Latest TG radio update. Nuke agents can now hear all radio, which is intercepted to their frequency. Remapped some stuff making the Comm Sat actually accessible by people with access. 2012-01-18 11:14:20 -07:00
Hawk-v3
7358dfa1a8 Merge pull request #289 from Tastyfish/master 
allow non-MMI brains to ghost (since they can't do anything), admin-spawnable bone repairing syrum
 2012-01-17 18:03:09 -08:00
Tastyfish
d1fc384533 allow non-MMI brains to ghost (since they can't do anything), admin-spawnable bone repairing syrum 2012-01-17 20:34:12 -05:00
Tastyfish
c6b7ddc84b Merge pull request #287 from Abi79/master 
TG update: Vending machine GUI overhaul.
 2012-01-17 16:44:26 -08:00
SkyMarshal
c8bbba7a71 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-17 08:48:35 -07:00
SkyMarshal
ded268cab9 Bugfix for ID access and map. 2012-01-17 08:48:01 -07:00
Albert Iordache
fe65cb88d9 Removed the ads from the vending machines. 
Now, I like puns, but you see, some were horrible.
 2012-01-17 11:59:48 +02:00
vageyenaman@gmail.com
9cc379273e TG update: Vending machine GUI overhaul. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2694 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-17 11:49:03 +02:00
Albert Iordache
a253e02dda Merge pull request #282 from Uristqwerty/master 
Slightly modified A* improvement
 2012-01-17 00:57:07 -08:00
SkyMarshal
f509cda7b0 Merge pull request #284 from Tastyfish/master 
added orderable chickens and cows
 2012-01-16 23:17:36 -08:00
SkyMarshal
0d7ce5f347 Port of the TG radio system. Tasty and I tested it out and it works smooth and clean :) 
We were able to restore functionality after we blew up half the radio equipment, as well.
AI satellite is now the Comms satellite.
 2012-01-17 00:12:30 -07:00
Tastyfish
53baf4755f Merge remote-tracking branch 'upstream/master' 2012-01-16 20:27:36 -05:00
Tastyfish
df208f7189 added orderable chickens and cows 2012-01-16 20:26:17 -05:00
cib
9dfec57e18 Blob now requires oxygen to grow. 2012-01-16 12:13:15 -08:00
Albert Iordache
b33a54b825 Renamed the bone cracker to "bone setter" 2012-01-15 23:59:21 +02:00
Uristqwerty
c3b12f3945 A* distance estimate improvement try #2: Only change it where pathing ignores diagonals, leave the old one where diagonals are considered. 2012-01-15 16:26:10 -05: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
Albert Iordache
8de86927f8 Merge pull request #272 from Miniature/master 
Made hydroponics happen 5 times slower
 2012-01-12 11:28:57 -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
Miniature
79b4e56971 Made hydroponics happen 5 times slower, current rate means you have no time to do anything 
This is entirely a guess at the correct speed and will likely require further changes
 2012-01-13 00:57:27 +10:30
Tastyfish
a8e8af6242 Merge pull request #269 from SkyMarshal/master 
Fixed bugs with wrapping yourself in a closet, new CentCom uniforms, reactive teleport armor now works and has a sprite, fixed implanter issues.
 2012-01-11 22:32:43 -08:00
SkyMarshal
80761ed2e5 Added pink labcoat. 2012-01-11 22:21:26 -07:00
SkyMarshal
98b6019f99 Implanters now work properly. This is a bugfix. 2012-01-11 21:28:34 -07:00
SkyMarshal
ef45b6128c Fixed some UI stuff. 2012-01-11 20:40:41 -07:00
cib
a7b188a201 Bug fix: Tramadol pill bottle spawned empty, and kelatone pill bottle spawned with tramadol. 2012-01-11 18:03:19 -08:00
Albert Iordache
25f7741772 Fixed a UI bug caused by the lack of var/over = 1 for PDAs 2012-01-12 16:58:46 +02: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
7f00b759c4 Merge remote-tracking branch 'upstream/master' 2012-01-11 16:27:37 -05:00
Tastyfish
0c22767896 fixed meteor to actually hit the station with meteors 2012-01-11 16:27:14 -05:00
SkyMarshal
66322d580c Bugfix for implanters. 2012-01-11 11:26:56 -07:00
SkyMarshal
5d39c6058b Fixed bug with busting out of packages. 2012-01-11 10:01:42 -07:00
SkyMarshal
a8ea86e2c1 Merge pull request #263 from SkyMarshal/master 
Bugfix for rad storms being insane.
 2012-01-10 22:16:02 -08:00
SkyMarshal
7675472393 Bugfix for radiation belts being insane. 2012-01-10 23:14:43 -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
299947a4b8 added body scanner to check organs 2012-01-11 00:24:42 -05:00