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
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
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
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
SkyMarshal
70cb3417ef
Added weldpack, clipboards fit on belt, food and other things can now be wrapped
2012-01-12 11:13:05 -07:00
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
b5c8b89a4d
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
code/WorkInProgress/Mini/customitems.dm
2012-01-12 01:48:33 -05:00
Tastyfish
abefe71bba
fixed derpy bug in spawning right dismembered foot
2012-01-12 01:47:15 -05: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
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
Tastyfish
a85e8eee50
Merge pull request #271 from caelaislinn/master
...
conveyors on the mini mining outposts should now work properly
2012-01-11 23:03:00 -08:00
SkyMarshal
54d3184f2a
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-01-11 18:13:35 -07: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
dc87ddc766
Missed a flag
2012-01-11 12:42:29 -07:00
SkyMarshal
3d9658178a
Removed space capability from captain's armor.
...
Added memo on his desk informing him.
2012-01-11 12:34:45 -07:00
