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
mwerezak
aeb1f5ae68
Updates instances of if(cell.use(...))
2015-05-14 01:52:04 -04:00
Zuhayr
4e85c5f387
Dev merge.
2015-05-12 23:33:29 +09:30
Chinsky
e9cc39039c
Merge pull request #8946 from Zuhayr/miningstuff
...
Wall refactor/mining changes.
2015-05-12 13:13:31 +03:00
Zuhayr
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
Zuhayr
4cf296a6c9
First pass on custom item cleanup/refactor.
2015-05-12 10:53:16 +09:30
Zuhayr
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
Kelenius
3fa79f8d51
Removes click cooldowns almost everywhere.
...
Still have: doors, windoors, cameras, windows, grilles, blobs, resisting, alien stuff, mechas, spray bottles.
Setting changeNextMove is now responsibility of the item being attacked.
Adds a config option to eliminate click cooldowns completely. Intended to be used by devs.
2015-05-09 17:27:19 +03:00
mwerezak
f3dd96bb8c
Adjusts charge costs for gun/energy
...
In particular, charge costs were chosen so that mounted energy guns
drain 80% of a default rig's power cell in 40 shots, and mounted laser
cannons drain the same in 20 shots.
2015-05-07 00:13:21 -04:00
mwerezak
3e1e137cec
Adds device powercells
...
Adds a type of smaller power cell for powering devices. Not used by much
at the moment, but it's one step closer to a more coherent picture of
power cells.
2015-05-06 23:41:57 -04:00
RavingManiac
f1ccb3ee6e
Muzzle-flash lighting effect for guns
...
Energy guns now display shots remaining on examine
2015-05-03 12:19:11 +10:00
Kelenius
4500eac948
Merge and removal of a wild file
...
Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
code/modules/reagents/Chemistry-Holder.dm
2015-04-29 14:20:44 +03:00
PsiOmegaDelta
851d5423f3
Merge pull request #8971 from mwerezak/burst-fire
...
Gun firemode system, burst firing
2015-04-28 20:24:03 +02: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
e93e9c1434
Expands firemodes to include energy gun settings
...
Expands on firemodes to include settings for the egun/adv egun,
floraray, and pulse rifle.
By default attack_self() now cycles firemodes for any gun. Updates
several projectile guns in a desperate attempt to avoid the need for an
unload ammo verb.
2015-04-28 02:06:54 -04:00
mwerezak
f1c2cbe519
Adds gun firemodes and burst firing
...
Adds support for different gun firemodes, and defines firemodes for various automatic weapons, as well as the double-barreled shotgun
2015-04-26 03:13:52 -04: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
PsiOmega
71a8ddf50e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/modules/paperwork/paper.dm
code/modules/projectiles/projectile.dm
2015-04-08 10:55:26 +02:00
Chinsky
ae75e3555e
Merge remote-tracking branch 'remotes/upstream/dev-freeze' into conscience
...
Conflicts:
code/modules/mob/living/carbon/human/human_attackhand.dm
2015-04-05 05:23:14 +03:00
Kelenius
db30c15e4c
Updates to science
...
Protolathe and CI build procs moved to them from RD console.
Protolathe and CI now have a build queue. Designs take varying time to
build.
P and CI material storage is now a list instead of a set of vars.
origin_tech is now a list.
All sheets now contain exactly 2000 units of matter.
In design datum, chemicals and materials are two separate lists.
Designs are now sorted. The method is kinda hacky but flexible. They
have a var, sort_string. Designs are sorted alphabetically using it.
Circuits how show whether they build a machine or a computer in CI menu.
Adds item construction, for now protolathe is used.
2015-04-04 13:38:03 +03:00
PsiOmega
8e55ad8114
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/mob.dm
2015-04-03 09:33:05 +02:00
PsiOmegaDelta
015fb291fa
Merge pull request #8698 from mwerezak/gun-icons
...
Fixes swapped STS-35 item states
2015-04-01 06:32:29 +02:00
mwerezak
5fe486dfe3
Fixes swapped STS-35 item states
...
Renames the states to prevent future confusion
2015-03-31 20:26:31 -04: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
Zuhayr
299a977701
Merge pull request #8679 from Yoshax/tempgun
...
Fixes #8672
2015-03-31 15:17:47 +10:30
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
Zuhayr
3472513cf9
Merge pull request #8645 from mwerezak/gun-icons
...
Adds Skowron's inhand icons for various guns
2015-03-31 14:12:03 +10:30
Yosh
286dffcda0
Fixes #8672
...
Fixes #8672 however the temperature gun is still utterly and completely
useless, but hey, at least you can fire it now.
2015-03-30 21:59:59 +01:00
Chinsky
1a93042226
Fixes #8548
...
Removed referenced to type of ammo used from descriptions.
2015-03-30 22:06:29 +03:00
PsiOmegaDelta
fefb55db93
Merge pull request #8674 from GinjaNinja32/rig_guns
...
Rig weapon fixes
2015-03-30 15:02:22 +02:00
mwerezak
1b4e13aabc
Removes unnecessary and cruft procs from mob/inventory.dm
2015-03-30 05:28:09 -04:00
GinjaNinja32
e342bf8a3a
Fixes #8673 , also makes some messages clearer and removes the twin cooldowns on rig weapons
2015-03-30 03:54:18 +01:00
=
d77010221c
Merge with dev.
2015-03-30 08:36:52 +10:30
mwerezak
c59fac2e16
Adds unloaded item state for the STS-35.
2015-03-29 02:40:57 -04:00
mwerezak
ba9b8756da
Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file
2015-03-29 01:52:26 -04: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
0c3a18b0b6
Merge pull request #8380 from volas/sanitize_procs
...
[DNM] sanitize() and text.dm refactoring
2015-03-29 00:57:33 +10:30
mwerezak
36cf695256
Adds Skowron's inhand icons for various guns
2015-03-28 02:10:09 -04:00
Zuhayr
59adbae59e
Removes the vox armalis.
2015-03-27 16:41:32 +10:30
