cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,292 Commits 5 Branches 0 Tags
770fb4de4cedaa7fc332b6e97a7b9b5d4a2e880e
Commit Graph

8418 Commits

Author SHA1 Message Date
Ccomp5950
770fb4de4c Merge pull request #6052 from PsiOmegaDelta/Mapping 
Fixes #6027
 2014-08-19 12:01:14 -05:00
Zuhayr
677ac1f7bb Merge pull request #6051 from comma/detcomp 
Initial commit of detective console rewrite.
 2014-08-19 21:46:52 +09:30
Ccomp5950
3c19520df2 Merge pull request #6059 from mwerezak/power-net 
Fixes APCs eating up all the power even when fully charged
 2014-08-19 06:02:34 -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
c42d9171d6 Makes power monitor a power machine again 
Also moved the power monitor code to modules/power
 2014-08-19 01:45:23 -04:00
mwerezak
1cfc3b8d5f Fixes APCs eating up all the power even when fully charged 2014-08-19 01:14:18 -04:00
Chinsky
b43759fee9 Initial commit of detective console rewrite. 
Changed forensic data to use record datum instead of unreadable arrays.
Now handheld scanner transfers data by clicking the big console, not by scan.
Rewrote high res scanner console. Now it leaves compiling dossiers to player, via use of filters.
 2014-08-19 00:50:14 +04:00
PsiOmega
11ce777d9c Fixes #6027 
Creates two proper monitor circuits for Engineering/Mining.
Adds air alarms in the Research access foyer.
Relocates camera in Misc. research to a more central location.
Ensures there are enough Telecommunication Satellite SMES units to meet power demand.
 2014-08-18 22:37:54 +02: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
6679434713 Merge pull request #6024 from mwerezak/laser 
Adjusts laser cannon damage
 2014-08-18 09:29:27 +09:30
Zuhayr
2a6a312dbe Merge pull request #6019 from mwerezak/radio 
Fixes machines being able to put the Radio Controller to sleep + Radio Controller cleanup
 2014-08-18 09:25:24 +09:30
Zuhayr
4740898b23 Merge pull request #6016 from comma/rads 
Rad damage changes
 2014-08-18 09:24:49 +09:30
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
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
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
mwerezak
d399fb610d Renames "laser gun" to "laser carbine" 2014-08-14 22:59:18 -04:00
PsiOmega
46a50dc7a2 Removes the loophole ion-law. Adds in some other ion law changes. 2014-08-14 11:20:45 +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
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
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
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
Zuhayr
649af28c77 Fixed the overlay issue for now. This will need replacing. 2014-08-13 12:04:51 +09:30
Chinsky
573f49624e Added suggested new type of wounds for stumps 2014-08-12 19:48:17 +04: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
Zuhayr
54ec5f0233 Attempting to fix a very weird overlay error, refactoring some shit mining code. 2014-08-11 11:42:16 +09:30
Zuhayr
beaad5a37b Merged in preferences file changes, changed None to Unset for home system. 2014-08-11 10:38:01 +09:30
Zuhayr
a2945a00d7 Merge pull request #5940 from mwerezak/power-net 
Update for shield generator power use and power net fixes
 2014-08-11 10:13:26 +09:30
Chinsky
dddaab172c Made missing limbs not process. 
Moved code in processing so that ORGAN_DESTROYED limbs won't process wounds and chemicals. They still need to process once to actually fall off (too lazy to change that)
Made dropping limbs remove all wounds and germs. Instead, one big wound is spawned on parent organ. Damage depends on the organ.
Removed missing  limbs bleeding on their own, since that's what that wound is for now.
They still would ache until surgically mended anyway.
Fixed possible issue with amputation not fixing the rotten limb.
 2014-08-11 04:35:45 +04:00
Ccomp5950
a44a9b2d61 Merge pull request #5942 from Jarcolr/customs 
Fixes 2 broken custom items, adds 1 new one and removes duplicate icon_state file
 2014-08-10 18:54:36 -05:00
Ccomp5950
ceeb389a55 Merge pull request #5948 from mwerezak/train 
Fixes runtime in train/explode()
 2014-08-10 18:53:27 -05:00
Ccomp5950
06da9e8070 Merge pull request #5941 from Whitellama/master 
Fixes #5577, Dionaea crashing on death. Fixes #5838, tomes not being able to be stored on bookshelves."
 2014-08-10 18:53:11 -05:00
mwerezak
8482314541 Fixes runtime in train/explode() 2014-08-10 18:37:39 -04:00
Chinsky
06aa6ab798 Merge pull request #5937 from Walter0o/patch-4 
capsaicin and condensedcapsaicin changes
 2014-08-11 01:57:24 +04:00
Chinsky
7df146ba2a Merge pull request #5924 from mwerezak/train 
Fixes #5915
 2014-08-11 01:57:02 +04:00
mwerezak
03e557823c Fixed #5912 
Also fixes hydroponics trays not updating
 2014-08-10 16:29:09 -04:00
Whitellama
c87ad570f8 Cult tomes can't be destroyed with ethanol 2014-08-10 12:50:53 -07:00
mwerezak
58e0b659d4 Reorganizes shieldgen source code and icon files 2014-08-10 11:58:25 -04:00