Commit Graph

908 Commits

Author SHA1 Message Date
CIB
c6af564979 Merge pull request #329 from SkyMarshal/master
Removes odd (and buggy) Z-levels 7-12 that are randomly generated on Sandbox and Extended.  I put 10 dollars that this was goon code.
2012-01-29 13:11:40 -08:00
SkyMarshal
4b1359e722 Removes odd (and buggy) Z-levels 7-12 that are randomly generated on Sandbox and Extended. I put 10 dollars that this was goon code. 2012-01-29 03:49:35 -07:00
SkyMarshal
f096580734 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-28 21:32:56 -07:00
SkyMarshal
820f3c1242 Merge pull request #324 from CIB/master
Stuff
2012-01-28 20:31:25 -08:00
SkyMarshal
21a648dc73 Added certificate of awesome, centcom stamp, removed broken gamemode 2012-01-28 21:30:43 -07:00
cib
f6dcb3d079 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-28 19:00:56 -08:00
cib
0b71628c05 Fixed a typo. 2012-01-28 18:35:22 -08:00
cib
e14dfc5ace Added autopsy.
- When a human is attacked, data about the weapon is added to a special wound datum on the organ.
- This data can be extracted and processed by opening up the limb and using an autopsy scanner on it.
- Added the autopsy-scanner to the map.
2012-01-28 02:26:44 -08:00
SkyMarshal
3e9146f99a Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	maps/tgstation.2.0.8.dmm
2012-01-28 02:03:42 -07:00
SkyMarshal
0e51764af4 Final load of bugfixes. Moved ported stuff to a subdirectory in Work in Progress, telecomms bugfix, fix for solar trackers, some human and monkey procs. 2012-01-27 22:55:16 -07:00
SkyMarshal
12afd61ffc Ported Uplinks, Door stuff, Hacktools, Compressed Matter implant. 2012-01-27 20:15:06 -07:00
Hawk-v3
6bf4e70727 Power Control Computer can now remote toggle APC main circuit breakers!
Codegift from Newt.
2012-01-28 02:40:38 +00:00
SkyMarshal
21fe68972f Lots of stuff, will elaborate later. 2012-01-27 11:18:14 -07:00
SkyMarshal
cd5e2476bd Added a new object, for storing premade outfits, that is in clothing closets.
Added clothing closets for several new jobs (Chef, Bartender, Virologist, etc.) and outfitted them.
Paper can now be burned, and acts as a hotspot and a light source when it is on fire.
Tweaked the Allinone broadcasters
Nerfed electrical storms
Response Team leader gets a special assignment/title.
Remapped to add Copiers, Filing Cabinets, and wardrobes
2012-01-26 22:19:33 -07:00
Albert Iordache
619afea38f Revert "water pipes base + pda support"
This reverts commit a591aef35c.
2012-01-27 10:06:12 +02:00
Tastyfish
07d989bbd7 Merge remote-tracking branch 'upstream/master' 2012-01-25 20:05:16 -05:00
SkyMarshal
336284127b Fixed a bug 2012-01-25 14:35:59 -07:00
SkyMarshal
81b8520c61 More flexible RCD ammo stuff. 2012-01-25 14:16:11 -07:00
SkyMarshal
d61626440c Response Team Update:
-Response team now have a pimp'n base, containing gear for the leader as well as Medical, Engineering, and Security special loadouts.
-TG updates for comms and mulebot
-Special medical tools for response team
-Increased time between events slightly.
-Map updated with nerfed comm satellite, and added Death Alarms in medbay in addition to the new Response Team area.
2012-01-25 11:51:55 -07:00
Tastyfish
40dbc8a659 Merge remote-tracking branch 'upstream/master' 2012-01-24 15:47:07 -05:00
Tastyfish
a591aef35c water pipes base + pda support 2012-01-24 15:45:51 -05:00
Tastyfish
d141673b87 Merge pull request #306 from SkyMarshal/master
More telecomms, improved mob interface, cleaned up the operating table.
2012-01-22 22:53:29 -08:00
SkyMarshal
201046c3bf Improved capabilities to set someone else's internals.
Improved the operating table again.
Grabbed another TG update for telecomms.
2012-01-22 15:31:13 -07:00
Albert Iordache
c433785ad3 Hopefully fixed a runtime error caused by aliens crawling through vents. 2012-01-22 10:24:23 +02: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
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
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
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
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
SkyMarshal
70cb3417ef Added weldpack, clipboards fit on belt, food and other things can now be wrapped 2012-01-12 11:13:05 -07: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
SkyMarshal
25e1633487 Merge pull request #259 from Tastyfish/master
Took long enough to fix this damn bug.
2012-01-10 20:39:05 -08:00
Tastyfish
763c9ec07b paint is reagent, fixed ai core bug 2012-01-10 18:05:19 -05:00
Miniature
225b2ad03e fix runtimes in disposals pipes and seed making for a plant
whoever coded those parts should be shot
2012-01-10 10:56:58 +10:30
Tastyfish
6cdae453b2 Merge pull request #249 from caelaislinn/master
made body bads orderable via qm
2012-01-08 23:07:32 -08:00
CaelAislinn
179ae3c2e4 made body bags orderable via qm
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-09 14:30:22 +10:00
Albert Iordache
9d2e285190 Fixed a bug with obj/item/clothing/under/chameleon/psyche , added some small details to Antiqua and redid the arrivals arm, and removed the patient ward area. (can still be recovered via TortoiseGit, by reverting to an earlier version; I'll explain in the Antiqua topic why I removed it) 2012-01-08 19:19:53 +02:00
SkyMarshal
40a0a5499e Bugfix for some table stuff I forgot.
Fixed a small message for writing on paper.
2012-01-07 10:51:32 -07:00
SkyMarshal
f517b95e5f Table update! Yaay!
Also: Fixed a redundant proc in the specops shuttle
fixed missing wire and disposal pipe in map.
2012-01-06 23:24:51 -07:00
SkyMarshal
3c128170a3 Shit to update 2012-01-06 16:50:19 -07:00