Commit Graph

1252 Commits

Author SHA1 Message Date
Tastyfish
18be394e7c map with water piping, bugfixes, optimizations 2012-01-25 22:17:14 -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
SkyMarshal
4139c553ad Merge pull request #316 from Hawk-v3/master
ERT edits.
2012-01-25 15:47:52 -08: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
Hawk-v3
2fd0795304 Merge pull request #315 from melonstorm/master
Change to prevent delivery chute sound spam
2012-01-25 14:37:51 -08:00
Melvin Melonstorm
011a40cf91 Prevent delivery chute sound spam 2012-01-25 23:30:14 +01:00
Melvin Melonstorm
34c09891f6 Revert "Prevent the delivery chute from spamming the chute sound when several objects are flushed simultaneously."
This reverts commit a356550d1b.
2012-01-25 23:28:39 +01:00
Melvin Melonstorm
a356550d1b Prevent the delivery chute from spamming the chute sound when several objects are flushed simultaneously. 2012-01-25 23:03:31 +01:00
SkyMarshal
b4bb9de1eb Spess suit tweaking 2012-01-25 13:39:26 -07:00
SkyMarshal
116a2b80e8 Tweaking space suits. 2012-01-25 13:28:48 -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
SkyMarshal
88c283ea1a Merge branch 'master' of github.com:SkyMarshal/Baystation12 2012-01-25 08:39:58 -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
SkyMarshal
2bf51ec238 Fix from TG for monkeys not dying. 2012-01-23 14:06:58 -07: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
2f1bc35ae0 Fixed some borkenness with guns, and tried making the command channel readable. 2012-01-22 23:50:58 -07: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
CaelAislinn
3879cfef53 fixed typo
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-23 14:24:04 +10: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
SkyMarshal
4eba1f9ff8 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-22 16:31:23 -07:00
SkyMarshal
20ac0c2235 Fixed some silliness I messed up on. 2012-01-22 16:28:13 -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
Albert Iordache
c433785ad3 Hopefully fixed a runtime error caused by aliens crawling through vents. 2012-01-22 10:24:23 +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
Albert Iordache
aebe5f2788 Merge pull request #301 from CIB/master
ERT stuff and an "Active Players" verb.
2012-01-20 23:57:01 -08:00
SkyMarshal
81e9d3cf68 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-20 16:41:29 -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
6e34145dac Removed debugging prompt stuff. 2012-01-20 14:30:24 -07:00
SkyMarshal
722bbee324 Interaction window now updates properly. 2012-01-20 14:27:29 -07:00
SkyMarshal
e806e95f79 Working to make the inventory auto refresh. 2012-01-20 13:15:50 -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
cib
c07785371d Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-19 21:10:17 -08:00
cib
822c6e3923 Changes related to the response team.
- There's now a chance involved with the response team spawning. The more people are dead, and the more antagonists there are, the higher the chance will be.
- You can now jobban people from the response team.
2012-01-19 20:47:04 -08: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
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
cc449f48c6 Merge remote-tracking branch 'upstream/master' 2012-01-17 20:36:03 -05: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
SkyMarshal
f509cda7b0 Merge pull request #284 from Tastyfish/master
added orderable chickens and cows
2012-01-16 23:17:36 -08:00