Commit Graph

4255 Commits

Author SHA1 Message Date
Chinsky
871456f131 Merge pull request #6084 from PsiOmegaDelta/MoreNounce
Announcement Refactoring
2014-08-21 21:53:03 +04:00
Chinsky
f559a7eb85 Merge pull request #6079 from PsiOmegaDelta/PipeDrop
Allows clicking floors to drop pipes
2014-08-21 17:34:13 +04:00
PsiOmega
f9df93fad0 Expands the use of the new announcement system.
Code Green/Blue/Red/Delta, ERT, and captain annoncements now use the new announcement system.
These announcements are stored as newscasts.
2014-08-21 12:58:02 +02:00
PsiOmega
68bf885e6b Announcement system refactoring.
Turns announcements into a datum based system to allow a variety of configurations.
Current configuration options include:
Admin logging
Which sound that should play when announced, if any
If the announcement should be stored as a newscast

Request console/standard announcements currently match priority announcements, but have a smaller style/footprint.
Player announcements now include the assignment and name of the person (or the id rather) who made it.

Have currently only updated the request console and all announcements which previously used captain_announce().
Affected automated announcements, such as shuttle messages, should be exactly the same as before.
2014-08-21 06:34:41 +02:00
Zuhayr
ee499426ad Compile fixes. 2014-08-21 12:19:10 +09:30
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
Zuhayr
0397ce5f1a Merge pull request #6076 from Jarcolr/patch-1
Fixes #5943
2014-08-21 11:19:30 +09:30
Chinsky
fd486ea369 Merge pull request #6064 from PsiOmegaDelta/Announce
AI Announcements & Verbs
2014-08-21 01:37:55 +04:00
PsiOmega
67752bd40b Allows clicking (simulated) floors to drop pipes
This makes it possible to install pipes under immovable objects, similar to power cables.
2014-08-20 12:21:42 +02:00
Jarcolr
c481d035f5 Fixes #5943
Recharging should give rods.
2014-08-20 11:14:54 +03:00
PsiOmega
a2253617cf Makes it possible for the AI to make station wide announcements. Improved AI verb handling in case of death/restoration. 2014-08-19 21:09:14 +02:00
Ccomp5950
25506f33fa Merge pull request #6032 from Walter0o/low_pressure_fix
fixes #6005 and broken ancient human low/high pressure code.
2014-08-19 05:54:30 -05:00
Ccomp5950
3c9fa8ba61 Merge pull request #6050 from mwerezak/breathing
Simplifies handling of inhale_pp
2014-08-19 05:52:37 -05:00
mwerezak
f9b4a78405 Fixes exhaling/inhaling types, cleanup 2014-08-18 14:58:18 -04:00
mwerezak
b04ac56d45 Cleanup/adjustment of inhale_pp handling 2014-08-18 13:33:51 -04:00
Zuhayr
65a31f2dc2 Merge pull request #6026 from mwerezak/internal-bleeding
Implements IB changes discussed in forum thread
2014-08-18 09:32:00 +09:30
Zuhayr
2033923f8f Merge pull request #6018 from Hubblenaut/master
Patch of fixes for bugs and oversights
2014-08-18 09:28:17 +09:30
JimTheCactus
e74d92370d Added a forced, immediate refresh of the icons after the character is made.
This eliminates a race condition between spawning in and the icon cache being updated to include the body.
2014-08-17 12:34:02 -06:00
Walter0o
e8592d4f41 fixes #6005 and broken ancient human low/high pressure code.
-fixes low/high pressure not damaging unsealed/damaged spacesuits.
-refactors procs and adds more comments.
-removes unused/dead code.
2014-08-17 18:06:30 +02:00
Chinsky
c660734299 Added probability scaling for non-damage events.
Fixed typo.
2014-08-17 11:05:17 +04:00
mwerezak
5b341bd810 IB initial damage now depends on damage taken
Also, autohealing IBs no longer stop bleeding, but do stop worsening.
2014-08-16 22:00:55 -04:00
Hubblenaut
d122ec9979 Sleeping people on chairs can be woken up 2014-08-17 02:34:26 +02:00
Hubblenaut
48655479b7 Hardcrit is entered immediately and lasts for 300 seconds instead of 250 (at max) 2014-08-17 02:21:31 +02:00
Hubblenaut
15ae5ca2a9 Adds JMP button to certain admin logs 2014-08-17 02:21:21 +02:00
Chinsky
09561db2d0 Added coefficient to scale speed of rads. Currently it's 10x slower than it was.
Added humans going bald on high rads levels.
Added a chance to get sick burn on highest rad level.
Replaced mutations (turning deaf/blind is unfun, and slowing rads would raise the chance of it happening) with a a chance of small genetic damage.
2014-08-16 09:32:24 +04:00
Chinsky
919ecc2a16 Merge pull request #5998 from Walter0o/gripper_fix
fixes #5693
2014-08-16 03:47:51 +04:00
Walter0o
de37978995 comment adjustment according to feedback 2014-08-15 06:19:55 +02:00
Chinsky
7351767ef7 Merge pull request #5983 from atlantiscze/co2-breath-fix
CO2 Breath fix
2014-08-14 22:58:22 +04:00
Chinsky
07ed87ccd9 Merge pull request #5993 from GinjaNinja32/proximity2
More proximity fixes
2014-08-14 22:55:29 +04:00
Walter0o
7236995b0e fixes #5693 2014-08-14 11:13:12 +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
04bf4c7d90 Merge pull request #5981 from Walter0o/sound_removal
removes unused AI text2speech files and code
2014-08-14 12:02:10 +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
GinjaNinja32
d1fc12e1c7 More proximity fixes 2014-08-13 20:58:49 +01: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
Zuhayr
688cf22a67 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-08-13 17:10:37 +09:30
Atlantiscze
ce2e34f5e5 - Fixes breathing not producing CO2. This applied to humans (untested for other races, but probably the same) 2014-08-13 09:02:49 +02:00
Walter0o
473a570b23 fixes #5970, prevents bugs in the future
this is not an issue at the moment but will become one should maxHealth ever get changed.
2014-08-13 03:43:30 +02:00
iamgoofball
88c034a30b Ports the "Family Man" Hair Pack from /vg/station. 2014-08-11 13:25:57 -07:00
PsiOmega
c3de9ca3c7 Fixes #5946 and cuts down on duplicate code across Life() procs. 2014-08-11 10:42:32 +02:00
Zuhayr
f09d1218fe Master to dev merge. 2014-08-11 17:23:40 +09:30
Walter0o
09d2acee62 fixes #5923
and a few other range issues
2014-08-11 04:45:50 +02:00