3e9146f99a
Merge branch 'master' of github.com:Baystation12/Baystation12
...
Conflicts:
maps/tgstation.2.0.8.dmm
2012-01-28 02:03:42 -07:00
695a673865
Final bugfixes, port of AutoTraitor (tested) and RP-Rev (Untested)
2012-01-28 01:52:14 -07:00
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
12afd61ffc
Ported Uplinks, Door stuff, Hacktools, Compressed Matter implant.
2012-01-27 20:15:06 -07:00
e8de0a1dca
Bugfixes for some of the previous commit. Added new icons that are less derpy.
2012-01-26 23:18:57 -07:00
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
619afea38f
Revert "water pipes base + pda support"
...
This reverts commit a591aef35c
2012-01-27 10:06:12 +02:00
4d5ecd09b6
Revert "more water pipes stuff"
...
This reverts commit 2d639d053b
2012-01-27 10:05:50 +02:00
af14d9c9e9
seems \himself doesn't work right, contrary to docs
2012-01-26 22:36:13 -05:00
07d989bbd7
Merge remote-tracking branch 'upstream/master'
2012-01-25 20:05:16 -05:00
2d639d053b
more water pipes stuff
2012-01-25 20:04:28 -05:00
c1246323f9
Prepping...
2012-01-25 14:14:30 -07:00
54d3ab562f
RCDs now make plating instead of full floors.
2012-01-25 13:55:09 -07:00
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
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
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
40dbc8a659
Merge remote-tracking branch 'upstream/master'
2012-01-24 15:47:07 -05:00
a591aef35c
water pipes base + pda support
2012-01-24 15:45:51 -05:00
08a9cabe76
Fixed some stuff related to the previous commit.
2012-01-22 23:45:16 -07:00
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
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
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
51780a5c05
Merge pull request #291 from SkyMarshal/master
...
Radio and map update.
2012-01-18 23:16:15 -08:00
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
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
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
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
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
b33a54b825
Renamed the bone cracker to "bone setter"
2012-01-15 23:59:21 +02:00
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
70cb3417ef
Added weldpack, clipboards fit on belt, food and other things can now be wrapped
2012-01-12 11:13:05 -07:00
80761ed2e5
Added pink labcoat.
2012-01-11 22:21:26 -07:00
98b6019f99
Implanters now work properly. This is a bugfix.
2012-01-11 21:28:34 -07:00
ef45b6128c
Fixed some UI stuff.
2012-01-11 20:40:41 -07:00
a7b188a201
Bug fix: Tramadol pill bottle spawned empty, and kelatone pill bottle spawned with tramadol.
2012-01-11 18:03:19 -08:00
25f7741772
Fixed a UI bug caused by the lack of var/over = 1 for PDAs
2012-01-12 16:58:46 +02:00
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
66322d580c
Bugfix for implanters.
2012-01-11 11:26:56 -07:00
5d39c6058b
Fixed bug with busting out of packages.
2012-01-11 10:01:42 -07:00
25e1633487
Merge pull request #259 from Tastyfish/master
...
Took long enough to fix this damn bug.
2012-01-10 20:39:05 -08:00
f404ea91d6
Merge pull request #260 from SkyMarshal/master
...
Disposal updates + map fix, traitor objective fix, Cult teleport talisman now teleports grabs
2012-01-10 20:38:14 -08:00
3b57d309cc
Disposals are now much more robust, with sorters being program-able, food able to be packaged, people able to flush closets, proper construction of sorters, and a function on taggers to use a custom tag.
...
In addition:
Made teleport talismans more amusing.
Fixed duplicate traitor objectives.
2012-01-10 21:21:52 -07:00
763c9ec07b
paint is reagent, fixed ai core bug
2012-01-10 18:05:19 -05:00
0340e5f58e
More medical changes.
...
- Added tramadol and oxycodone, both effective painkillers.
- Shock now takes drunkness into account.
- Added some firstaid stuff to the table in the medbay lobby, so people can do treatment when there's no doctors.
2012-01-10 09:16:11 -08:00
5e5d72d36d
Reverted changes that would stop the bible from healing occasionally, and from burning the hands of people picking it up, who aren't chaplains
2012-01-09 21:59:25 +02:00
f38406ec20
Merge pull request #252 from SkyMarshal/master
...
Fixed bible, medibots, added kitchen packager, ported TTP
2012-01-08 23:19:03 -08:00
9b8e24c9d1
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-01-09 07:45:56 -08:00
80f8c70e09
Band-aids and ointment work until 0 health, rather than 50 now.
2012-01-09 07:45:00 -08:00
7dec599f9b
Fixed medibot stupidity and bible shit.
2012-01-09 00:06:57 -07:00
58c3d6ebe3
cleaned up brain transfer
2012-01-09 01:24:42 -05:00
SkyMarshal