mwerezak
f8d5127078
Adds SLOT_EARS to various items
2015-06-21 01:45:43 -04:00
mwerezak
f62cc38883
Adds logging for syringe_gun
...
Also updates holder get_reagents() output formatting
2015-06-06 17:02:42 -04:00
Zuhayr
2714e458b3
Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev
2015-05-17 12:58:09 +09:30
PsiOmega
8b39f9201a
Compilation fixes.
2015-05-16 22:41:13 +02:00
PsiOmega
83a09faf07
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/brain/MMI.dm
code/modules/projectiles/guns/launcher/crossbow.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-05-16 22:38:01 +02:00
Zuhayr
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
Zuhayr
8aa24b86bb
Renamed shards, katanas, claymores.
2015-05-16 20:36:33 +09:30
mwerezak
d71a727131
remove_from_mob() considered harmful
2015-05-16 00:32:44 -04:00
mwerezak
5d620ff05b
Span classes
2015-05-16 00:21:40 -04:00
mwerezak
3e41d6ff6e
Fixes crossbow icon issue
...
Fixes an issue with the crossbow icon that occurred when releasing the
tension soon after starting to draw it back.
2015-05-15 23:06:29 -04:00
mwerezak
65819302f3
Fixes #8986 , one less object verb
2015-05-15 23:06:02 -04:00
mwerezak
29609f7ec6
Fixes #8985 , ammo magazine examine grammar.
2015-05-15 23:04:50 -04:00
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
Zuhayr
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
Zuhayr
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
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
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
e7d85f8edc
Adds Destroys.
2015-04-24 17:11:14 +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
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
mwerezak
398459c2e7
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/modules/organs/organ_external.dm
2015-03-31 02:13:22 -04:00
Chinsky
65f61122b5
Merge pull request #8604 from Zuhayr/limbs
...
Limb objects, severing and cybernetics
2015-03-31 08:38:54 +03:00
mwerezak
9b2f5cea33
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/game/gamemodes/revolution/rp-revolution.dm
code/game/machinery/kitchen/juicer.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/structures/stool_bed_chair_nest/stools.dm
code/modules/destilery/main.dm
code/modules/hydroponics/biogenerator.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/mob/living/carbon/monkey/inventory.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-03-31 01:37:55 -04:00
mwerezak
9ad533a094
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/monkey/update_icons.dm
code/modules/mob/mob_helpers.dm
code/modules/spells/spellbook.dm
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2015-03-31 00:16:56 -04:00
mwerezak
36cf695256
Adds Skowron's inhand icons for various guns
2015-03-28 02:10:09 -04:00
Kelenius
b4b635f32d
Chemistry commit
...
I messed something in the git
2015-03-25 19:09:10 +03:00
Zuhayr
f017764e64
More work on adjusting/tweaking/fixing the limb port to make it functional.
2015-03-25 00:59:17 +10:30
mwerezak
3bf5a5ca99
Updates storage costs
...
Storage cost of an item is now twice that of the next smallest item, instead of being equal to the w_class.
Items with w_class 1 or 2 are unaffected. This produces much better behaviour for containers that are limited
by storage space instead of slots, such as how toolboxes are planned to work in a future update.
2015-03-05 10:40:25 -05:00
mwerezak
e540550cff
Adds an underslung grenade launcher to the Z8.
2015-02-23 17:56:54 -05:00
mwerezak
09afd35798
Syringe gun cartridges change name when loaded
2015-02-20 21:04:19 -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
500ca93278
Fixes guns being unremovable
...
Fixes certain guns being unremovable due to unloading ammo taking
precedence over picking up. Also adds on-back icon for the merc sniper
which is just a copy of the LWAP's.
2015-02-16 01:47:07 -05:00
mwerezak
ad24aa8e47
Adds mercenary sniper rifle
...
Adds the scoped mercenary sniper rifle and ammunition defines. Does not
add syndicate uplink option.
2015-02-14 22:33:43 -05:00
mwerezak
a6095a3610
Updates L6 SAW
...
Also changes src in user checks, probably unnecessary.
2015-02-14 22:09:19 -05:00
mwerezak
e5f8ac50b4
Rewrites grenade launchers
2015-02-14 13:39:11 -05:00
mwerezak
08635587e1
Fixes revolver paths, span classes, typo. Cleans exodus-1.dmm
...
Tweaks syringe gun and dart gun, renames syringe gun cartridges and makes them printable.
Adjusts penetration so that passing through mobs happens with a probability that scales with damage.
Adds a .45 signal pistol to the HoP's closet and a 9mm one to the mercenary shuttle.
2015-02-14 13:38:05 -05:00
mwerezak
f8977c65af
Much nicer syringe gun implementation
...
Makes syringe guns a type of launcher gun, and removes the hack
projectile.
Also moves syringe and dart gun source files into the modules/projectile
folder.
2015-02-13 23:48:35 -05:00
mwerezak
1e9143a1f0
Reorganizes launcher source files
2015-02-12 01:38:54 -05:00
