cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,766 Commits 8 Branches 0 Tags
ba36df71a7657bf6656c7b19f81b51e5b27875dc
Commit Graph

624 Commits

Author SHA1 Message Date
Kelenius
948252d25b Removes unused files added by accident, separates reagent files 2015-04-28 11:00:56 +03:00
Kelenius
317abc6b79 Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/datums/recipe.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/extinguisher.dm
	code/game/objects/items/weapons/mop.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/organs/organ_internal.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/exodus-1.dmm
 2015-04-28 10:49:26 +03:00
mwerezak
c2751b0b12 Fixes #8823 2015-04-27 00:26:53 -04:00
PsiOmegaDelta
967223364d Merge pull request #8988 from mwerezak/droplimb 
Adjusts threshold for limb removal due to damage
 2015-04-26 19:16:34 +02:00
mwerezak
b20f604d0c Adjusts threshold for limb removal due to damage 2015-04-26 01:58:52 -04:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
mwerezak
d6498cd45f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dislocation 
Conflicts:
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/human_organs.dm
 2015-04-13 17:12:02 -04:00
mwerezak
da5518f8b2 Updates various dependencies on organ brokenness to use the is_broken() proc. Updates external organ brokenness to ensure broken description is set. 2015-04-13 16:38:33 -04:00
Zuhayr
fe0185697e Some dislocation fixes/adjustments. 2015-04-07 19:50:26 -07:00
mwerezak
81bcad2b33 attackhand cleanup 2015-04-07 15:12:32 -04:00
Zuhayr
b197cb69fa More organ fixes. Yay. 2015-04-03 21:47:37 -07:00
Zuhayr
3493b60faf Attempting to fix icon procs for organs. 2015-04-03 21:04:05 -07:00
Zuhayr
be270bb0d3 Runtime fixes. 2015-04-03 20:56:37 -07:00
Zuhayr
05e85fc134 Should fix the limb spam issue. 2015-04-03 19:11:35 -07:00
Zuhayr
78925ebd79 Minor loc oversight. 2015-04-03 18:48:49 -07:00
Zuhayr
67c6c4321f Fixes an issue with internal organ transplants. 2015-04-03 06:18:34 -07:00
Zuhayr
eeee0dfb9f Numerous runtime/oversight fixes. 2015-04-03 06:12:36 -07:00
Zuhayr
a3ed7fc033 Should fix the head and hair issues from the organ rewrite. 2015-04-03 05:41:33 -07:00
Zuhayr
1673e8d514 Added organs to the processing list when removed, oops. 2015-04-01 20:54:34 -07:00
Zuhayr
84b903cf69 Fixes #8702 properly. 2015-04-01 17:57:28 -07:00
Zuhayr
3cc34ab55e Organ tweaks/fixes. 2015-04-01 17:38:15 -07:00
Zuhayr
294a1ff1f1 Should fix #8710 2015-04-01 17:27:06 -07:00
Zuhayr
c3eb6102b4 Added a few null checks. 2015-04-01 17:15:59 -07:00
Zuhayr
8475be5d4e Fixes a few incidental bugs with the antag and organ changes. 2015-04-01 06:33:47 -07:00
Zuhayr
57f5c5d15f Fixes #8702 2015-04-01 05:18:32 -07:00
Kelenius
41ff9819bd Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/organs/organ_internal.dm
	code/modules/organs/organ_objects.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/syringes.dm
 2015-03-31 17:44:42 +03:00
=
2e728cfd4b Added macros for droplimb flags. 2015-03-31 11:42:45 +10:30
=
ea25f4fb73 Adjusting burn drop prob. 2015-03-31 11:20:28 +10:30
Kelenius
24ef7752cd Merge branch 'Baystation12/dev' into ofChemistryAndStuff 
Conflicts:
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
 2015-03-28 19:14:59 +03:00
Zuhayr
accbb02b7f Fixing bugs. 2015-03-28 11:53:39 +10:30
Zuhayr
8f242740a8 Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs. 2015-03-28 11:01:11 +10:30
Zuhayr
c5d42f3a4b More work on severing, improvements to yank-out-object. 2015-03-27 17:51:10 +10:30
Zuhayr
aa6439096c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-26 23:25:26 +10:30
Kelenius
b4b635f32d Chemistry commit 
I messed something in the git
 2015-03-25 19:09:10 +03:00
Zuhayr
bb2cd41c8c Fixed up gibbing and organ icons. 2015-03-26 00:40:59 +10:30
Zuhayr
9c92d3851a Got various kinds of limb loss plus dislocation working. 2015-03-25 23:11:00 +10:30
Zuhayr
97112c8a4c Replaced display_name with name, worked on severing limbs and damage propagation. 2015-03-25 19:07:22 +10:30
Zuhayr
d26800d29c Preliminary work on converting all monkeys to a human subspecies. 2015-03-25 02:15:45 +10:30
Zuhayr
f017764e64 More work on adjusting/tweaking/fixing the limb port to make it functional. 2015-03-25 00:59:17 +10:30
Zuhayr
3fe4162719 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-25 00:29:59 +10:30
Zuhayr
a63b9b4e73 Beginning to port over new icon update from limbs branch. WIP 2015-03-24 23:48:54 +10:30
PsiOmega
172110b582 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-16 12:37:43 +01:00
Chinsky
f03759a246 Fixes organ bioprinter and the organs. Now less debuggy and less buggy too. 2015-03-13 12:24:27 +03:00
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
Zuhayr
1984ef6e51 Master into dev-freeze. 2015-03-07 11:33:39 +10:30
Chinsky
f064305a7b Fixes #8268 2015-03-06 07:11:19 +03:00
Zuhayr
ee0d63a43d Merged with dev. 2015-02-24 17:03:39 +10:30
mwerezak
f7c65b4358 Makes IB no longer contribute to overall damage 2015-02-21 16:56:25 -05:00
Zuhayr
0c206344b6 Master<dev 2015-02-21 19:57:31 +10:30
Zuhayr
2ecd76b07f Master merge. 2015-02-21 19:51:28 +10:30