cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,395 Commits 6 Branches 0 Tags
b47d91b612a055af91aa692be99be6d7a24f90da
Commit Graph

14504 Commits

Author SHA1 Message Date
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
GinjaNinja32
b4e6b4e204 Fixes not checking proximity argument 2014-08-13 09:41:38 +01: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
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
Atlantiscze
40027d85bd Fixes #5974 
- Fixes possible disappearance bug for Laptops
 2014-08-13 08:19:46 +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
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
Walter0o
9421b4b48e fixes #5964 2014-08-13 03:38:41 +02:00
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
GinjaNinja32
dcd5092f23 Add floor painter 2014-08-12 20:47:26 +01:00
Chinsky
7befe12950 Merge pull request #5965 from Lancer411/dev 
Fixes for grid_check random event.
 2014-08-12 21:55:38 +04:00
Chinsky
4657b7d923 Merge pull request #5959 from Walter0o/typo_fix 
typo fix
 2014-08-12 20:14:10 +04:00
Chinsky
573f49624e Added suggested new type of wounds for stumps 2014-08-12 19:48:17 +04:00
Chinsky
064e55e9d0 Merge pull request #5963 from mwerezak/fixes 
Fixes #5953
 2014-08-12 19:22:48 +04:00
Zuhayr
3d16309444 Merge pull request #5956 from comma/optable 
Optable changes
 2014-08-13 00:46:21 +09:30
Zuhayr
78b1d4d473 Merge pull request #5960 from Ccomp5950/sci-age-limit 
Added client age restrictions for science jobs.
 2014-08-13 00:42:19 +09:30
Zuhayr
70c016814c Merge pull request #5955 from Walter0o/chem_reag_fix 
fixes #5919 and some other reagent issues
 2014-08-13 00:40:01 +09:30
mwerezak
c725ce0b7c airlock/arePowerSystemsOn() refactor 
airlock/arePowerSystemsOn() now checks if the airlock has power in
addition to the wires being intact.
 2014-08-12 10:46:54 -04:00