cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,475 Commits 8 Branches 0 Tags
a591aef35ca72fc65ab45250d1b9f456c800e15c
Commit Graph

2586 Commits

Author SHA1 Message Date
Tastyfish
a591aef35c water pipes base + pda support 2012-01-24 15:45:51 -05:00
Tastyfish
d6de48663e livestock spelling/grammer fixes 2012-01-24 15:41:54 -05:00
Tastyfish
23af06d4ed made blob require core to grow, quartered its growth speed 2012-01-23 18:11:19 -05: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
Albert Iordache
df354af1f3 Merge pull request #294 from Tastyfish/master 
added L & R to zone_sel hud thing, check antag call shuttle, marked datum call proc
 2012-01-19 11:01:04 -08: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
06fce40d34 herped the mark datum thing 2012-01-19 01:54:48 -05:00
Tastyfish
1be9c4cfed check antag "call shuttle" overrides fake recall, can use marked datum as arg in the bs12 call proc command 2012-01-19 01:19:58 -05: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
91b6e0072c Merge branch 'master' of git@github.com:Uristqwerty/Baystation12.git 
Conflicts:
	code/defines/turf.dm
 2012-01-15 16:29:08 -05: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
Uristqwerty
1f27f092a8 This might make A* work better, since BS12 doesn't have diagonal movement. 2012-01-15 04:07:06 -05:00
Uristqwerty
20dee7e71a This might make A* work better. 2012-01-15 04:05:30 -05:00
Tastyfish
1dbc4997fb put filing cabinet in correct path in tg standards 2012-01-14 00:54:58 -05:00
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
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
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
9e5925b1f9 fixed custom items loaded and custom_items.txt 2012-01-12 01:54:27 -05:00
Tastyfish
b5c8b89a4d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	code/WorkInProgress/Mini/customitems.dm
 2012-01-12 01:48:33 -05:00
Tastyfish
e5abd35dae made custom items read from a config file 2012-01-12 01:47:55 -05:00
Tastyfish
abefe71bba fixed derpy bug in spawning right dismembered foot 2012-01-12 01:47:15 -05:00
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
Albert Iordache
0a3ca62f53 Merge pull request #270 from Tastyfish/master 
Made custom items read from a config file.
 2012-01-12 01:02:00 -08:00