cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,271 Commits 8 Branches 0 Tags
b3cd08068a5fb4da3f7e5ca303a4021f89bc3c76
Commit Graph

14400 Commits

Author SHA1 Message Date
PsiOmega
b3cd08068a Noted a wall-deletion optimization made over at -tg. Credit to @Aranclanos. 2014-08-19 10:50:17 +02:00
Zuhayr
df6723deb0 Merge pull request #6036 from mwerezak/power-net 
Fixes laptop power draw, improves cell chargers
 2014-08-18 21:04:02 +09:30
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
Zuhayr
4e862ec9a7 Merge pull request #6014 from comma/spacearea 
Replaces /area with /area/space
 2014-08-18 09:21:44 +09:30
mwerezak
6d6413a59b Fixes laptop power draw, improves cell chargers 
Cell chargers no longer call use_power() in their process()
 2014-08-17 15:30:29 -04: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
3c46e4c35b Fixes airlocks aborting when cycled 
Fixes airlocks aborting because the doors took too long to close.
 2014-08-16 14:39:37 -04:00
mwerezak
bcc07d3296 Fixes machines being able to put the radio controller to sleep 2014-08-16 14:37:44 -04:00
Chinsky
72fed65b10 Merge pull request #6011 from PsiOmegaDelta/BrigTimers 
Unstationary cell status displays now fixed
 2014-08-16 10:44:59 +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
03cdfaf896 Changed /area to /area/space to get rid of anicent and terrible strict typechecks every time you needed to check if it's space area. 2014-08-16 05:28:45 +04:00
mwerezak
d4218e7cd7 Allows airlock access buttons to use ID in hand 2014-08-15 21:01:33 -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
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
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
PsiOmega
30cb1a32fb No more auto-adjustment of cell status displays. 2014-08-15 08:55: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
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
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
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
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
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
GinjaNinja32
7b7f526903 Fixes being able to use the floor painter through windows, windoors etc. 2014-08-13 09:30:11 +01: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
Snapshot
1476234698 Merge pull request #5958 from iamgoofballsecondfork/familyman 
https://www.youtube.com/watch?v=tZZv5Z2Iz_s (Because there's so many of us, git it?)
Ports the "Family Man" Hair Pack from /vg/station.
 2014-08-12 22:39:14 -07:00
Zuhayr
649af28c77 Fixed the overlay issue for now. This will need replacing. 2014-08-13 12:04:51 +09:30
Lancer411
2882576358 Fix for infinite loop in smokeFlow() proc. 
When chemical grenade being activated on any unsimulated turf (for example a space turf), smokeFlow() starts infinite while loop, overloading the server.
With the only one unsimulated turf in pending list while() loop can't finish itself and for() loop can't start.
This fix makes chemical grenades being able to explode in space without server going in infinite loop.

Also fixed issue with smoke being able to pass through glass walls with help of c_airblock() proc. That's the best solution I could come up with.
Zone check code was useless because every single turf besides walls (which allready checked) and unsimulated turfs have it, making algorithm believe that turfs behind the glass wall are being reachable by chemsmoke.
I don't know if it was intended not to spread smoke in airless or unsimulated areas, but a bunch of airless simulated floor tiles in space is good enough for this algorithm to start spreading smoke around.

P.S. this algorithm is good for large, open areas and horrible in narrow maint tunnels. It is creating only a single cloud of smoke for 50/50/50 recipie in 1 tile wide tunnel.
 2014-08-13 06:26:30 +08:00
GinjaNinja32
9abd6765b1 More floor tiles 2014-08-12 21:13:46 +01:00
GinjaNinja32
0493090f15 Add more floor tile types 2014-08-12 21:09:51 +01:00