cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,552 Commits 8 Branches 0 Tags
68dc63e005f801bf5a2cb10b8c89ddcd1323d219
Commit Graph

8542 Commits

Author SHA1 Message Date
Whitellama
09907858f3 Added fingerprints and logs when wrenching fuel tanks, and added JMP buttons to logs regarding fuel tanks. 2014-08-17 15:51:01 -07:00
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
Whitellama
f1494c9b76 Admins now get logs when welding fuel is spilled on the floor, and welding tanks gain fingerprints when someone gets fuel from them. 2014-08-17 02:48:08 -07:00
Chinsky
c660734299 Added probability scaling for non-damage events. 
Fixed typo.
 2014-08-17 11:05:17 +04:00
mwerezak
bd397ff844 Adjusts laser cannon damage 
Increased laser cannon damage to be higher than regular laser damage.
Also updated the name var of /laser/captain so that it doesn't inherit
"laser carbine"
 2014-08-16 22:34:23 -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
mwerezak
add9ec3b65 Makes IB bleed with same rate as external bleeding 
Also updates drip() to remove the amount of blood actually passed into
it as argument.
 2014-08-16 21:45:21 -04:00
mwerezak
d8b6aecc32 Fixes escape shuttle announcing a negative ETA 
Fixes the escape shuttle announcing a negative ETA when it leaves late.
 2014-08-16 21:02:05 -04:00
mwerezak
2bd96ab29e Fixes multi docking port undocking conditions 
The undocking conditions for multidocking ports (used by the escape
shuttle) were overly strict, failing if any door was open/unlocked.
Changed to allow undocking if at least one of the inner or outer doors
can close and lock.
 2014-08-16 20:50:34 -04:00
Hubblenaut
d122ec9979 Sleeping people on chairs can be woken up 2014-08-17 02:34:26 +02:00
Hubblenaut
1602cb883c Surgical tools that are nowhere near the patient don't cause a fail step 2014-08-17 02:34:25 +02:00
Hubblenaut
cbb0a3c0b7 Fixes a surgery oversight regarding text coloring 2014-08-17 02:21:32 +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
1de0e2cb44 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into spacearea 
Conflicts:
	maps/tgstation2.dmm
 2014-08-16 06:29:55 +04:00
Ccomp5950
9f57c1b16e Merge pull request #6012 from Walter0o/gear_fix 
fixes #6007 and future bugs with gear names
 2014-08-15 20:08:25 -05:00
Chinsky
f71e43d06c Moved ambiance sounds out of horrendous ifchain to area definitions. 
Changed ambiance spamcheck to use time instead of 10 minute spawn.
 2014-08-16 04:40:46 +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
Walter0o
a3848871d4 fixes #6007 and future bugs with gear names 2014-08-15 11:11:13 +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
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
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
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
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
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
PsiOmega
2a46b83dce Adds new items. Source: https://github.com/Baystation12/Baystation12/pull/5928 2014-08-13 09:35:04 +02:00
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
Zuhayr
649af28c77 Fixed the overlay issue for now. This will need replacing. 2014-08-13 12:04:51 +09:30