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
26,847 Commits 5 Branches 0 Tags
b80c01ffbebbdcd472a80e15ad50a7b9e53679f0
Commit Graph

1015 Commits

Author SHA1 Message Date
mwerezak
b80c01ffbe Removes *COVERSEYES 
Removes (HEAD|MASK|GLASSES)COVERSEYES flags, in favour of using
body_parts_covered.
 2015-08-18 17:06:49 -04:00
PsiOmega
e92e819bd9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-18 18:29:01 +02:00
PsiOmega
8138815dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-18 18:05:16 +02:00
Kelenius
cf78446463 Fixes #10730 2015-08-18 16:10:25 +03:00
Zuhayr
a8dc3a282b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs 2015-08-18 12:06:53 -07:00
Kelenius
7c1d9b5614 Mech chargers are now a single machine 
Can be built and upgraded
Resolves #5215
 2015-08-16 06:07:36 -07:00
Kelenius
bb915a2c34 Reverts #10649, fixes #10621 2015-08-16 06:04:39 -07:00
Kelenius
abf2bea2f0 Fixes #10599 2015-08-16 06:04:38 -07:00
PsiOmega
13076b6f55 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-16 10:32:06 +02:00
PsiOmegaDelta
7b5b7162d0 Merge pull request #10673 from Baystation12/master 
Dev-freeze
 2015-08-16 10:30:13 +02:00
PsiOmegaDelta
311dbcb0f0 Merge pull request #10658 from mwerezak/chem-fix 
Fixes overdose not working for ingested reagents
 2015-08-16 10:18:16 +02:00
Zuhayr
eccdfd8d9a Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2015-08-16 05:45:16 -07:00
Zuhayr
7e8713039a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-16 05:40:47 -07:00
mwerezak
5f98346ab5 Fixes overdose not working for ingested reagents 2015-08-15 10:22:07 -04:00
Kelenius
cb5df3963a Reverts #10649, fixes #10621 2015-08-15 13:15:52 +03:00
Kelenius
3b29856694 Fixes #10599 2015-08-15 13:04:57 +03:00
PsiOmega
4cf736bb5c Compilation fix. 2015-08-15 11:12:43 +02:00
PsiOmega
c81ad0964e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
 2015-08-15 11:06:03 +02:00
PsiOmega
3a08e2884a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm
 2015-08-15 10:52:17 +02:00
Snapshot
3b7ed9bdc4 Merge pull request #10649 from mwerezak/coffee-fix 
Fixes #10621
 2015-08-14 22:51:43 -07:00
Snapshot
5f5671d21f Merge pull request #10647 from mwerezak/acids 
Fixes #10645
 2015-08-14 22:22:41 -07:00
mwerezak
3163de7a50 Fixes #10621 
Coffee now adds jittery as an overdose effect. Set overdose so that drinking two full cups in one go (60 units) will result in 150 jitteriness.
 2015-08-14 23:44:46 -04:00
mwerezak
133bc96344 Fixes #10645 
Sets unacidable where appropriate.
 2015-08-14 23:20:10 -04:00
Kelenius
aa318b8d1c Merge branch 'dev' into ofBeesAndHoney 
Conflicts:
	code/modules/materials/material_recipes.dm
 2015-08-14 16:55:21 +03:00
PsiOmegaDelta
d5c6d9c341 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-14 08:43:43 +02:00
PsiOmegaDelta
3a55b130a0 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	.travis.yml
	code/modules/virus2/disease2.dm
	maps/exodus-5.dmm
 2015-08-14 08:34:42 +02:00
Chinsky
0056a889de Moved antibodies to the rest of reagents. 
Updates them to use new chem processing.
Also axes unused commented out code.
 2015-08-14 04:53:46 +03:00
mwerezak
e0965bc2cb Implements inserting rags into booze bottles 2015-08-13 18:37:17 -04:00
mwerezak
b003e2f94c Lowers the volume of eggs to 10 2015-08-13 18:37:15 -04:00
mwerezak
498253f056 Splashing atoms now causes a proportion of the chems to land on the target's loc 
Splashing now differs from trans_to(). A proportion of the splashed chemicals will splash on the target's loc, until a turf is splashed.
 2015-08-13 18:37:15 -04:00
mwerezak
b5425e0bd9 Makes beer and ale bottles into actual bottles, adjusts bottle smashing 
Generalizes opening drink containers, makes beer and ale bottles a subtype of bottle instead of can
Adjusts bottle smashing, duration, damage, and reliability.
 2015-08-13 18:37:13 -04:00
mwerezak
5ae15e222c Bottles smash when thrown using harm intent 
Throwing a glass bottle at something nearby on harm intent causes it to smash, splashing it's contents over whatever it hits.
If the hit atom is too far away the bottle will not smash. Also it does not smash with 100% reliability.
 2015-08-13 18:32:50 -04:00
Kelenius
65a9e11a52 Merge branch 'dev' into ofBeesAndHoney 
Conflicts:
	baystation12.dme
 2015-08-13 08:33:46 +03:00
PsiOmegaDelta
93e914f021 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/setup.dm
 2015-07-30 10:49:37 +02:00
PsiOmegaDelta
841f7f6db2 Compilation fixes. 2015-07-30 10:41:01 +02:00
PsiOmegaDelta
b6bd51828a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/robot/robot_upgrades.dm
	code/modules/admin/admin_verbs.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/syringes.dm
 2015-07-30 10:38:44 +02:00
GinjaNinja32
7a6599fdf4 Add logging to potassium-water and nitroglycerin reactions 2015-07-29 12:36:00 +01:00
GinjaNinja32
84c7625490 Chemical logging improvements 2015-07-29 07:55:30 +01:00
PsiOmegaDelta
5cbb703609 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/update_icons.dm
	code/modules/organs/organ.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/setup.dm
 2015-07-27 10:20:20 +02:00
PsiOmega
984d5ee337 More #10285 fixes. 
This one is dev-freeze only.  Adds another sanity check to trans_to_holder to avoid runtime issues.
 2015-07-26 10:46:58 +02:00
PsiOmega
bd6ec4a98e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/atoms.dm
	code/game/machinery/rechargestation.dm
 2015-07-26 10:21:36 +02:00
PsiOmega
659b07415d Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/machinery/rechargestation.dm
	code/game/mecha/equipment/tools/medical_tools.dm
 	maps/exodus-1.dmm
 2015-07-26 10:00:12 +02:00
PsiOmega
3c1a3f6951 Fixes #10285. 
Adds Topic() input sanity checking.
 2015-07-25 14:18:10 +02:00
PsiOmegaDelta
74872e28a7 Compilation fix. 2015-07-24 11:02:39 +02:00
PsiOmegaDelta
f3c9a7224b Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
	code/modules/reagents/reagent_containers/borghydro.dm
 2015-07-24 10:53:57 +02:00
Chinsky
90ae24dd1c Merge pull request #10135 from Kelenius/ofBorgsAndShakers 
Of borgs and shakers
 2015-07-23 21:41:48 +03:00
Kelenius
b6beb8c299 Admin logs for borg hypo 2015-07-20 09:31:02 +03:00
PsiOmegaDelta
388343a84e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/recharger.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob.dm
 2015-07-20 08:28:32 +02:00
PsiOmega
b308e34388 Fixes #10170. 
Removes the bunsen burner completely. Was after the chem rework basically never referenced anyway.
 2015-07-18 22:51:20 +02:00
PsiOmegaDelta
34fdc4712e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm
 2015-07-14 08:21:12 +02:00