Commit Graph

4064 Commits

Author SHA1 Message Date
Hawk-v3
60eb7d6ac7 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-26 23:49:36 +00:00
CIB
7966116455 Merge pull request #523 from SkyMarshal/master
DNA/Fingerprint fixes, explosions no longer autogib corpses.
2012-02-26 15:48:56 -08:00
Hawk-v3
ef02499eec Commit for Patch 23 2012-02-26 23:47:26 +00:00
SkyMarshal
a5eac62c48 TG UPDATE: Player Panel updates! 2012-02-26 16:46:07 -07:00
SkyMarshal
f030b1e063 Merge pull request #522 from Hawk-v3/master
Justice Suit Costumes Try 2
2012-02-26 15:35:07 -08:00
cib
2c59cbd71d Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-27 00:31:15 -08:00
cib
c31b9c4986 Forgot a file. 2012-02-27 00:30:39 -08:00
SkyMarshal
50ffc5409c Fixes for some DNA/Fingerprint stuff
Fixed explosions autogibbing corpses at any power (WHY was this there?)
2012-02-26 16:34:16 -07:00
Hawk-v3
35f061477e Sky's change, again. 2012-02-26 23:32:33 +00:00
Hawk-v3
3a3e857e1d Justice Suits, Try 2 2012-02-26 23:29:11 +00:00
Albert Iordache
96e797e6a8 Merge pull request #520 from SkyMarshal/master
Cleaned up cloning machine stuff, removed the "Scratch" hat from the costume landmarks. (Had a really irritating animation.)
2012-02-26 08:36:09 -08:00
SkyMarshal
95d89e8491 Removed the scratch hat from one of the costumes. (Good god, that was an irritating animation)
Cleaned up the cloning machine searching code a tad.
The kitty ears tail is no longer animated.
2012-02-26 09:29:38 -07:00
Albert Iordache
214020d264 Merge pull request #516 from CIB/master
Skill selection dialog
2012-02-26 07:36:20 -08:00
cib
33d12d11d9 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-02-26 06:45:06 -08:00
Albert Iordache
aeee8832b2 Merge pull request #518 from Iberis/master
Antiqua Security + Misc
2012-02-25 22:51:04 -08:00
Iberis
03e89a5115 Created Security from scratch.
Moved Atmos out of the way.
Tweaks on Medbay, the area around Engineering. Maintenance.
2012-02-26 05:02:24 +01:00
Iberis
7b5e38d1d1 Updated the access_level.txt for mappers
from the access.dm
2012-02-26 01:13:58 +01:00
SkyMarshal
878879fe61 Merge pull request #517 from AppleMaster/master
Added wall lockers
2012-02-25 15:55:34 -08:00
Apple_Master
7a0d186bb7 Added wall lockers
Signed-off-by: Apple_Master <cheeckan@ymail.com>
2012-02-25 23:53:53 +00:00
cib
0f40ff7ccf Added a skill selection menu. 2012-02-25 15:19:00 -08:00
SkyMarshal
fceecbf9b7 Merge pull request #515 from SkyMarshal/master
The singularity can no longer eat the AI's freelook mob.
2012-02-25 15:03:02 -08:00
SkyMarshal
f50a3215b6 Singularity can no longer eat the AI's eye mob
Cleaned up how throwing works.
2012-02-25 16:01:00 -07:00
Mloc
2f719b5b81 Merge pull request #514 from AppleMaster/master
Abi said to do this.
2012-02-25 12:58:35 -08:00
Apple_Master
c8af3fa0d1 Made Antiqua's Cafeteria not bad. Needs atmos/wiring.
Signed-off-by: Apple_Master <cheeckan@ymail.com>
2012-02-25 20:51:45 +00:00
Apple_Master
cbaea87dc7 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-02-25 18:02:57 +00:00
Miniature
76fb3f9d7f Merge pull request #513 from Miniature/master
Debug info for distro and scubber pipe connections, removed redundant pipes in sec breaking everything (sorry for anyone working on map changes, this is kinda urgent)
2012-02-25 08:09:04 -08:00
Miniature
caafe64e68 Added debug information (to the log with ooc and all that, feel free to make it actually make an error) for when the scrubber and distro atmos loops are directly linked at round start, fixed a thing where someone left multiple pipes with the same dir in a brig cell, causing pipes to freak the hell out 2012-02-26 02:35:58 +10:30
Albert Iordache
db79fa9052 Merge pull request #512 from CIB/master
Added tricord to robotics lab as they're needed for medbots
2012-02-25 07:55:16 -08:00
Albert Iordache
1842da43cb Fixed .dme 2012-02-25 17:53:12 +02:00
cib
d4c6a81db2 Re-added tricordrazine beakers to the robotics lab, since they're needed to make medbots useful. 2012-02-25 05:31:07 -08:00
Albert Iordache
0df0b9bf5e Merge pull request #511 from SkyMarshal/master
Altered detective scanner functionality.
2012-02-24 23:26:46 -08:00
SkyMarshal
aec188d140 Merge pull request #510 from CIB/master
Radiation and singularity stuff
2012-02-24 23:22:28 -08:00
SkyMarshal
74fd808873 Altered functionality of detective scanner.
Fixed that damn book cluster spawning.
Secure doors can now be opened by hitting them with yer hand
Cleaned up surgery tools
People now lie down and stand properly.
For Cajoes: Cleanbot is more robust, and cleans up kitchen messes, now.
2012-02-25 00:17:03 -07:00
cib
fc0de6e366 Changes to singularity radiation and suits.
- The singularity now regularly emits radiation, making it actually dangerous to go into the PA room without protection.
- Made the hoods of suits be less effective at consuming radiation than the body of the suit.
2012-02-24 14:05:47 -08:00
cib
74c50e30b8 Bugfix to radiation.
The proc for applying radiation was doing some wrong calculations, making the *maximum* radiation damage you could ever receive be 0.
2012-02-24 13:45:04 -08:00
cib
885ec78be8 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-24 12:29:16 -08:00
cib
e00ac05279 Fixed the .dme 2012-02-24 12:28:37 -08:00
Albert Iordache
0c75c8edec Merge pull request #509 from CIB/master
Edit and Delete for news
2012-02-24 12:17:56 -08:00
cib
24d9c95507 "Edit" and "Delete" added to the news feature. 2012-02-24 12:01:35 -08:00
SkyMarshal
22d5e4659f Merge pull request #508 from Iberis/master
Antiqua Medbay
2012-02-24 11:16:56 -08:00
Iberis
45f9321906 Changes to Antiqua Medbay.
Changed Maintenance, ER, Patient Treatment, CMOs Office
Set the morgue up with a table for autopsy
Pics in the thread.
2012-02-24 20:08:54 +01:00
SkyMarshal
9bd26c3051 Merge pull request #507 from CIB/master
Bugfixes for #436, #489, #479, #484
2012-02-24 10:44:09 -08:00
cib
11583a9ff3 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-24 10:37:25 -08:00
cib
20e6e0116a Changes to breathing and medbots. Fixes #436 and #489 2012-02-24 10:37:08 -08:00
CIB
a5d1184495 Merge pull request #505 from SkyMarshal/master
Reduced slowdown from singularity.
2012-02-24 09:08:29 -08:00
SkyMarshal
8e528d058c More singularity tweaks 2012-02-24 10:07:03 -07:00
SkyMarshal
dd360c6f49 Reduced slowdown from singularity
Tried to fix the buggy job screen.
Added a stat==2 check to human life (Why was that NOT THERE ALREADY?)
2012-02-24 10:02:53 -07:00
cib
f95f04da8e Small fix to the examine code. 2012-02-24 08:08:06 -08:00
Apple_Master
35dfb4a7ed Added Artifact #1
Signed-off-by: Apple_Master <cheeckan@ymail.com>
2012-02-24 16:07:35 +00:00
cib
76cee10c6a Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-02-24 06:41:38 -08:00