Zuhayr
411987c68b
Merge resolution with master.
2015-06-28 06:02:52 +09:30
Ravensdale
ba3d180db6
Remove posi-mmi-mechs
...
fix
actual removal
2015-06-26 12:37:37 -07:00
Zuhayr
ec5e05b9f1
Antagonist system refactor. Fixes #9495 , #9290 , #9521 , #8800 and #9465 .
2015-06-21 18:08:26 +09:30
PsiOmegaDelta
66b8d67637
Merge pull request #9390 from mwerezak/attack-animation
...
Attack animations
2015-05-21 06:52:30 +02:00
mwerezak
87178d74a6
Adds attack animation calls for attack_generic()
2015-05-20 00:19:39 -04:00
Zuhayr
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
Kelenius
10915eae24
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/game/objects/effects/chem/chemsmoke.dm
code/modules/customitems/item_defines.dm
code/modules/projectiles/guns/launcher/syringe_gun.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
code/modules/reagents/reagent_containers/food/drinks.dm
code/modules/reagents/reagent_containers/pill.dm
maps/exodus-1.dmm
2015-05-15 11:28:05 +03:00
Chinsky
8d83e8d452
Merge pull request #9202 from Zuhayr/customitems
...
Custom items refactor.
2015-05-14 21:47:04 +03:00
PsiOmega
cb5535a64b
Fixes #9221 .
...
Removes premature loc = null change.
Also fixes an issue occuring when the impact of an ion bullet would wreck a mech before triggering the EMP.
This would cause null runtimes as a now removed object would be accessed.
2015-05-13 12:37:18 +02:00
Zuhayr
a9f936fe42
Added exosuit customisation kits to cargo.
2015-05-13 11:20:54 +09:30
Zuhayr
4e85c5f387
Dev merge.
2015-05-12 23:33:29 +09:30
Zuhayr
49930fe55d
Debugging!
2015-05-12 21:30:06 +09:30
Zuhayr
f76a1d2024
Removed custom item defines, refactored mech kits.
2015-05-12 15:49:56 +09:30
Zuhayr
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
Zuhayr
e28acd5045
Dev merge.
2015-05-11 18:45:14 +09:30
Zuhayr
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
Mloc
7780287d3a
mood lighting for computers
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 20:54:29 +01:00
Mloc
16d50c645d
new object-based lighting system
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 20:54:25 +01:00
Mloc
e602a7e286
remove the sub-area system
...
Removes area/list/related and area/master.
They were only used by the old lighting subarea system.
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 17:06:29 +01:00
PsiOmega
78a9a43de6
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/controllers/master_controller.dm
code/game/objects/items/devices/powersink.dm
2015-05-06 12:19:50 +02:00
Daranz
82b7af7fb5
Fix mech fabricators not syncing
...
Fixes #9058 .
2015-05-05 11:42:05 -04:00
Kelenius
33dde892e2
Fixes a few log-destroying lines
2015-05-04 21:33:30 +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
PsiOmega
541fff5ad2
Crushing closets or mechas will now cause damage to the door.
2015-04-27 19:02:38 +02:00
PsiOmega
19a981e961
Airlocks can now crush more things.
...
Airlocks can now crush mobs, canisters, closets, and mechas.
Fixes #8983 .
2015-04-26 19:29:13 +02:00
Zuhayr
79e3acc95e
Finalized wall refactor.
2015-04-26 12:58:57 +09:30
Zuhayr
dbf8e53020
Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores.
2015-04-26 12:53:26 +09:30
PsiOmega
1fea589ad7
Merge remote-tracking branch 'upstream/dev' into TheSummoning
...
Conflicts:
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +02: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
Jarcolr
0030ca76af
Spans instead of fonts.
...
Hopefully no typos.
2015-04-17 15:34:37 +03:00
PsiOmega
a6a428af6a
Mecha + misc. Destroy() because I had already begun.
2015-04-17 09:55:59 +02:00
Jarcolr
9fda2a2614
Fixes #8633
...
Hopefully the wording is okay. Targeting dev because this file is ahead on master.
2015-04-16 17:27:57 +03: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
=
601e6fb7ef
Merged with dev.
2015-03-31 11:17:13 +10:30
=
d77010221c
Merge with dev.
2015-03-30 08:36:52 +10:30
PsiOmega
1a000b0e0f
Merge remote-tracking branch 'upstream/dev' into NarsiePort
...
Conflicts:
code/modules/mob/living/carbon/human/say.dm
2015-03-29 13:04:53 +02:00
PsiOmega
464d702d4b
Mob refactoring.
...
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
2015-03-29 10:44:31 +02:00
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
8f242740a8
Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.
2015-03-28 11:01:11 +10:30
Kelenius
b4b635f32d
Chemistry commit
...
I messed something in the git
2015-03-25 19:09:10 +03:00
Zuhayr
b9072baa97
Merge with dev.
2015-03-24 14:41:07 +10:30
volas
f8822626bb
sanitize() refactor: second pass(other sanitize functions)
2015-03-23 01:38:09 +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
mwerezak
3de6374b4a
Allows unconscious/dead exosuit pilots to be removed if maintenance protocols are enabled.
...
Enable maintenance protocols -> wrench -> crowbar -> multitool.
2015-03-10 02:47:54 -04:00
mwerezak
2fcf8d51f4
Allows exosuits to interface with adjacent airlock controllers and buttons.
2015-02-21 20:54:01 -05:00
PsiOmegaDelta
4e785f716a
Merge pull request #8160 from mwerezak/stools
...
Replaces stool structures with stool items
2015-02-18 07:35:54 +01:00
mwerezak
57ffdc82f6
Replaces stool structures with stool items
2015-02-18 01:06:00 -05:00
mwerezak
c804d818fd
Fixes rocket launcher icon
...
Also makes the missiles a little bit less of a joke.
2015-02-16 22:59:35 -05:00
mwerezak
cd81f0b706
Improves gun scope zooming
2015-02-14 22:12:16 -05:00
mwerezak
ea39f7f718
Cleanup can_fire(), projectile flag
...
Removes can_fire() and moves some of it's functionality into
get_next_projectile(), which was renamed to consume_next_projectile() to
indicate the possibility of side-effects.
Also renamed flag var to check_armour
2015-02-12 01:37:19 -05:00
