Commit Graph

1755 Commits

Author SHA1 Message Date
SkyMarshal
a386fd39fa Removed a duplicated definition. 2012-01-28 02:31:01 -07: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
f623c4848e Derp, missed files. 2012-01-28 01:54:05 -07:00
SkyMarshal
695a673865 Final bugfixes, port of AutoTraitor (tested) and RP-Rev (Untested) 2012-01-28 01:52:14 -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
e8de0a1dca Bugfixes for some of the previous commit. Added new icons that are less derpy. 2012-01-26 23:18:57 -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
Albert Iordache
4d5ecd09b6 Revert "more water pipes stuff"
This reverts commit 2d639d053b.
2012-01-27 10:05:50 +02:00
Tastyfish
af14d9c9e9 seems \himself doesn't work right, contrary to docs 2012-01-26 22:36:13 -05:00
Tastyfish
07d989bbd7 Merge remote-tracking branch 'upstream/master' 2012-01-25 20:05:16 -05:00
Tastyfish
2d639d053b more water pipes stuff 2012-01-25 20:04:28 -05:00
Hawk-v3
27beb7f3fd ERT edits.
Changed the chemical amounts and added some info to each team's section, plus cloner and Cure Machine to Shuttle.
2012-01-25 23:17:04 +00:00
SkyMarshal
c1246323f9 Prepping... 2012-01-25 14:14:30 -07:00
SkyMarshal
d58e7229da More replacing with plating. 2012-01-25 13:56:45 -07:00
SkyMarshal
54d3ab562f RCDs now make plating instead of full floors. 2012-01-25 13:55:09 -07:00
SkyMarshal
db995ad625 Pimped out the RCD, is now more flexible about amounts, and a subtype (/obj/item/weapon/rcd/industrial) that starts preloaded with 60 units. 2012-01-25 13:53:57 -07:00
SkyMarshal
005593db01 Removed redundant thing. 2012-01-25 13:44:43 -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
SkyMarshal
53a22d1f4b Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-25 08:42:44 -07:00
SkyMarshal
0aee00be62 Things should be throwable past tables. Response team should work a bit better, added space suit for medics. 2012-01-25 08:41:11 -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
Hawk-v3
22c1266d88 Merge pull request #308 from Tastyfish/master
made blob require core to grow, quartered its growth speed
2012-01-23 21:10:05 -08:00
Tastyfish
23af06d4ed made blob require core to grow, quartered its growth speed 2012-01-23 18:11:19 -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
08a9cabe76 Fixed some stuff related to the previous commit. 2012-01-22 23:45:16 -07:00
Albert Iordache
2d67fdd58c Merge pull request #299 from caelaislinn/master
added pacman that uses plasma tanks instead of coins
2012-01-22 22:43:22 -08:00
SkyMarshal
a9520990f7 More updates for the response team and stuff. The response team telecomm unit now works right, radios now have an autosay proc for automated announcements, the SpecOps shuttle now uses autosay, proper energy guns replace the bugged ones, Automated (non player AI) announcement of new players, another attempt at making the command frequency legible, HUD icon for secHUDs and ERT members. 2012-01-22 22:41:17 -07:00
cib
e2e1cecd7d Changes to medbots.
- They now have a mode, which is enabled by default, in which they only inject chemicals if the chemical helps with the target's damage.
- You can now load and unload them without access.
- Added a few beakers of tricordrazine to robotics, so they can load medbots when they make them.
2012-01-22 19:22:07 -08:00
SkyMarshal
fa06a12b1e Fixed some stupid stuff with the Spec Ops shuttle and the wrong energy guns given to mobs. 2012-01-22 19:41:13 -07:00
cib
40ae6b8340 Made the dialog for when there are too many runes and there's a chance you'll be gibbed a little more clear. 2012-01-22 17:05:08 -08:00
SkyMarshal
9bc6c7eb9a Fixed some errors. 2012-01-22 16:42:56 -07:00
SkyMarshal
4eba1f9ff8 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-22 16:31:23 -07: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
cib
8acc4d5fac Changed the miniblob replication speed from every 3 seconds to every 15 seconds. 2012-01-20 16:51:12 -08:00
Albert Iordache
39a4def802 Minor spelling changes. 2012-01-21 09:59:28 +02:00
Albert Iordache
2eb90ae2e4 Merge pull request #303 from SkyMarshal/master
Fixed book titles in one instance, Borg lighters work right, fixed an error I made when labeling Death Alarms.
2012-01-20 23:58:17 -08:00
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
CaelAislinn
f1b2f77586 added pacman type II generator and the pacmanII circuit board. pacman2 runs off plasma tanks instead of coins, but doesn't output as much power (90% of the t1 gen, to be precise) and requires the same level of power storage tech to make as a super pacman.
untested, but should work.

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-20 23:53:03 +10: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
cib
c07785371d Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-19 21:10:17 -08:00