Commit Graph

14676 Commits

Author SHA1 Message Date
mwerezak
200741d611 Refactored copypasta in post_signal() 2014-08-15 20:36:45 -04:00
mwerezak
9d7c5dc197 Gives filters proper names, updates airlocks to use filters
Docking ports still don't use filters though, as it would mess with the
docking ports that are also airlocks. Docking is infrequent though so it
should be fine.
2014-08-15 20:27:00 -04:00
Chinsky
919ecc2a16 Merge pull request #5998 from Walter0o/gripper_fix
fixes #5693
2014-08-16 03:47:51 +04:00
Chinsky
68fc5d91c6 Merge pull request #6009 from mwerezak/laser
Renames "laser gun" to "laser carbine"
2014-08-16 03:47:05 +04:00
mwerezak
3bc5cde223 Updates radio controller pathnames to be absolute 2014-08-15 17:09:38 -04:00
mwerezak
edd7a718b2 Moves the radio controller to the controllers dir 2014-08-15 17:05:51 -04:00
Raptor1628
75e63e55a4 More Fixes
Changes detective's office to better looking and flowing version, adds a
few more lights in places, updates security job numbers for new spawn
count.
2014-08-15 12:25:56 -04:00
Walter0o
a3848871d4 fixes #6007 and future bugs with gear names 2014-08-15 11:11:13 +02:00
PsiOmega
30cb1a32fb No more auto-adjustment of cell status displays. 2014-08-15 08:55:55 +02:00
Walter0o
de37978995 comment adjustment according to feedback 2014-08-15 06:19:55 +02:00
mwerezak
d399fb610d Renames "laser gun" to "laser carbine" 2014-08-14 22:59:18 -04:00
Raptor1628
f1c44601e5 Brig Fixes
Fixes a few lighting issues, brig cell doors, adds missing berets to the
wardrobe and closes disposals outlet.
2014-08-14 18:26:17 -04:00
mwerezak
7b4f439cdf Fixes #6002 2014-08-14 17:37:16 -04:00
Chinsky
7351767ef7 Merge pull request #5983 from atlantiscze/co2-breath-fix
CO2 Breath fix
2014-08-14 22:58:22 +04:00
Chinsky
e4847b729e Merge pull request #5994 from GinjaNinja32/shards
Stepping in shrapnel fix and unification of shard code
2014-08-14 22:55:39 +04:00
Chinsky
07ed87ccd9 Merge pull request #5993 from GinjaNinja32/proximity2
More proximity fixes
2014-08-14 22:55:29 +04:00
GinjaNinja32
b52450f053 Allows wheelchair occupants to drive if the driving mob is incapacitated 2014-08-14 19:24:00 +01:00
GinjaNinja32
9b9b69f547 Use absolute paths 2014-08-14 11:20:07 +01:00
GinjaNinja32
95528fb448 Remove inline comments 2014-08-14 11:17:33 +01:00
PsiOmega
46a50dc7a2 Removes the loophole ion-law. Adds in some other ion law changes. 2014-08-14 11:20:45 +02:00
Walter0o
7236995b0e fixes #5693 2014-08-14 11:13:12 +02:00
PsiOmega
6fffe8e077 Merge remote-tracking branch 'upstream/dev' into Brig2 2014-08-14 08:58:59 +02:00
Chinsky
658941a0f9 Merge pull request #5978 from Zuhayr/journalism
Mining changes and basic character backgrounds.
2014-08-14 10:54:49 +04:00
Chinsky
bcf0a57aa0 Merge pull request #5962 from mwerezak/wound-fixes
Wound and infection fever fix
2014-08-14 07:55:17 +04:00
Zuhayr
e1953c66cc Merge pull request #5995 from Hubblenaut/master
More admin logs, Rejuvenation fix
2014-08-14 12:16:42 +09:30
Zuhayr
8b3631e6d5 Merge pull request #5972 from Walter0o/psu_fix
fixes #5964
2014-08-14 12:03:59 +09:30
Zuhayr
43a7757252 Merge pull request #5982 from Jarcolr/customs
Adds the cigar case as a premium cigarette vending machine item.
2014-08-14 12:02:49 +09:30
Zuhayr
04bf4c7d90 Merge pull request #5981 from Walter0o/sound_removal
removes unused AI text2speech files and code
2014-08-14 12:02:10 +09:30
Chinsky
7187a8effd Merge pull request #5976 from atlantiscze/laptop-opening-fix
Fixes #5974
2014-08-14 06:31:27 +04:00
Chinsky
af9f56f164 Merge pull request #5969 from GinjaNinja32/floortiles
Adds floor painter.
2014-08-14 06:31:09 +04:00
Chinsky
abc587b64c Merge pull request #5971 from Lancer411/dev
Fix for infinite loop in smokeFlow() proc.
2014-08-14 06:31:06 +04:00
Chinsky
e23d47e6c2 Merge pull request #5996 from MrSnapwalk/hairhaireverywhere
Adds more new hair.
2014-08-14 06:30:24 +04:00
Zuhayr
4deeacc809 Merge pull request #5950 from comma/hurties
Hurties
2014-08-14 11:59:39 +09:30
MrSnapwalk
6b44ef8ff1 Adds new hair. 2014-08-13 20:15:07 -05:00
Hubblenaut
330ce5d088 Fixes rejuvenation ignoring infections 2014-08-14 01:55:30 +02:00
Hubblenaut
c80b921d6b Logs finishing tank transfer valve bombs and ghosting. Changes pAI request
to state the name of the inquirer.
2014-08-14 01:07:09 +02:00
Atlantiscze
ee3072019a Revert "N2 buildup fix attempt. Putting this into separate commit in case it's not wanted."
This reverts commit e8a7b58aff.
2014-08-13 23:42:58 +02:00
mwerezak
0b0380ae14 Fixes burn description saying it is salved when not 2014-08-13 17:11:25 -04:00
mwerezak
ca9fc4169d Fixes infection fever causing burn damage 2014-08-13 17:11:03 -04:00
GinjaNinja32
539392c14e Use \the macro 2014-08-13 21:30:28 +01:00
GinjaNinja32
05e7c4a07a Moved all shard code to one file. Fixed #5992 2014-08-13 21:05:27 +01:00
GinjaNinja32
d1fc12e1c7 More proximity fixes 2014-08-13 20:58:49 +01:00
Hubblenaut
30f590aef7 Fixes phoron reactions with oxygen not following a consistent reaction equation 2014-08-13 19:56:02 +02:00
Chinsky
5a785ee866 Merge pull request #5973 from Walter0o/robot_fix
fixes #5970, prevents bugs in the future
2014-08-13 18:41:29 +04:00
Chinsky
ed491e58f7 Merge pull request #5957 from mwerezak/train-cost
Adjusts train supply costs to make the tug/cart ratio choice more interesting for players.
2014-08-13 18:34:51 +04:00
Chinsky
1c5e944ce5 Merge pull request #5954 from Zuhayr/dev
No one is going to read this all anyway
2014-08-13 18:33:09 +04:00
Walter0o
94ec887a75 removes unused AI text2speech files and code,
saves about 4.5 MB traffic per client.
2014-08-13 11:24:23 +02:00
Atlantiscze
e8a7b58aff N2 buildup fix attempt. Putting this into separate commit in case it's not wanted.
- Right now, air consists of 20% O2 80% N2 (approx.). Breathing takes O2 and turns it into CO2. CO2 gets scrubbed. Pressure drops, vents refill with air which again contains 80% N2 20% O2.
- This means that only 20% of breathed-out oxygen is replenished. Rest is replaced by N2. In large areas, such as Bar, with many mobs this can eventually lead to dangerous atmosphere status.
- This fix, while OOCly slightly unrealistic handles this issue by turning both O2 and N2 into CO2. Tested in CE's office with 5 human mobs without active scrubbers. Air lasts for 2~ hrs. Larger areas of course last significantly longer.
2014-08-13 11:24:12 +02:00
Jarcolr
049c5c27f3 Merge branch 'customs' of https://github.com/Jarcolr/Baystation12 into customs 2014-08-13 12:12:09 +03:00
Jarcolr
6c807199c9 Adds the cigar case as a premium vending item
5 may be a bit too much, but who is going to get all those coins,
anyway?
2014-08-13 12:10:43 +03:00