SkyMarshal
a386fd39fa
Removed a duplicated definition.
2012-01-28 02:31:01 -07:00
SkyMarshal
735bc0b6ad
Derp.
2012-01-28 02:05:59 -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
416cec5da9
Merge pull request #320 from Hawk-v3/master
...
Power Control Computer can now remote toggle APC Main Breakers!
2012-01-27 21:04:17 -08: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
351ed2a250
Deeeerp. Bugfix.
2012-01-26 23:21:02 -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
cib
c5d7f97c98
Automatic healing and other medical stuff
...
- A mob with health > 0 will now slowly heal, around 1 damage per minute, unless it's cloneloss. This can be accelerated by sleeping.
- A mob with health < 0 will now slowly be damaged, also around 1 damage per minute. This can be decellerated by sleeping.
- Movement is no longer slowed by damage(unless it's a broken/missing bone), but only by trauma. This means that painkillers will help with movement speed.
- Painkillers now remove the red flashes and pain messages.
2012-01-26 19:16:08 -08: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
Albert Iordache
1a5d71faea
Revert "map with water piping, bugfixes, optimizations"
...
This reverts commit 18be394e7c
2012-01-27 10:05:32 +02:00
Tastyfish
de3edef492
Merge pull request #318 from Tastyfish/master
...
fixed text formatting bugs
2012-01-26 19:37:38 -08:00
Tastyfish
af14d9c9e9
seems \himself doesn't work right, contrary to docs
2012-01-26 22:36:13 -05:00
Tastyfish
a0e9986b50
fixed livestock attack flavor again, derp
2012-01-26 22:25:30 -05:00
Albert Iordache
d52104bd17
Merge pull request #317 from Tastyfish/master
...
water plumbing!!
2012-01-26 10:57:31 -08:00
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
6ae9a3fc0c
Merge pull request #314 from SkyMarshal/master
...
Fixed a bug
2012-01-25 13:36:58 -08:00
SkyMarshal
336284127b
Fixed a bug
2012-01-25 14:35:59 -07:00
Hawk-v3
c8b48cef43
Merge pull request #313 from SkyMarshal/master
...
RCDs are move flexable, and replace with plating instead of complete floors.
2012-01-25 13:19:28 -08:00
SkyMarshal
81b8520c61
More flexible RCD ammo stuff.
2012-01-25 14:16:11 -07: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
ad77df2bf3
Merge pull request #312 from SkyMarshal/master
...
Removed redundant flag on the response team shoes, they were already noslip.
2012-01-25 12:45:16 -08:00
SkyMarshal
005593db01
Removed redundant thing.
2012-01-25 13:44:43 -07:00
Hawk-v3
d34071cde5
Merge pull request #311 from SkyMarshal/master
...
Response team and map updates
2012-01-25 12:41:14 -08: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
Tastyfish
d6de48663e
livestock spelling/grammer fixes
2012-01-24 15:41:54 -05:00
