cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-17 05:32:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 6 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

9413 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
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
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
Chinsky
573f49624e Added suggested new type of wounds for stumps 2014-08-12 19:48:17 +04:00
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
44cc7159c4 Fixes a few issues with get_wound_type() 
Fixes damage causing "healing" wound types that can't bleed.
Fixes flesh wounds not bleeding the instant they heal any damage.
 2014-08-11 21:37:34 -04:00
iamgoofball
88c034a30b Ports the "Family Man" Hair Pack from /vg/station. 2014-08-11 13:25:57 -07:00
Walter0o
26ae447079 removes pointless has_reagent() checks 
remove_reagent() iterates safely through the holder list already,
unless you need to check a minimum amount,
or simply want to know if it is present, the call is not needed.
 2014-08-11 13:01:27 +02:00
Walter0o
342fbdd136 fixes #5919 and some other reagent value issues 
negative values everywhere.
 2014-08-11 12:46:43 +02: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
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
Whitellama
49c8c6f2cb Made arcane tomes a subtype of books, fixes #5838 2014-08-10 02:23:36 -07:00
Jarcolr
2db24a17d5 Typo 2014-08-10 11:57:40 +03:00
Jarcolr
4666966dab Fixes 2 broken custom items, adds 1 new one 
Fixes hazard hardsuit icon_state, paper icon_state missing for an item,
removed krinn_hatt from obj/clothing/hats.dmi since it's defined to be
in custom_items.dmi and added MiT labcoat
 2014-08-10 11:49:14 +03:00
Whitellama
cfa1ff3440 Fixed Dionaea crashing on death 2014-08-10 01:00:26 -07:00
mwerezak
e1dc7d436b Fixes icons and other things not updating when the master controller updates power status. 
This was due to the master controller using update_powered_status()
instead of power_change(), but many machines override power_change() to
do various things when the machine gains or loses power.
 2014-08-10 03:45:20 -04:00