mwerezak
f62cc38883
Adds logging for syringe_gun
...
Also updates holder get_reagents() output formatting
2015-06-06 17:02:42 -04:00
mwerezak
15d82778cd
Muzzle flash sets lighting instead of creating objs
...
Shooting a gun no longer generates illumination objects
2015-06-06 12:57:43 -04:00
PsiOmegaDelta
a07d20d657
Ports /tg/'s meteor implementation.
...
Merges the two meteor events into one, and now takes severity into consideration instead.
Including the basic meteors there are also new types ranging from flaming to radioactive which may drop appropriate types of ore.
2015-06-05 14:58:35 +02:00
Yoshax
1711d01e7a
Makes special wizard projectile staffs only usable by wizards.
2015-06-04 19:42:06 +01:00
Kelenius
3bdb5ff9ea
Merge branch 'dev' into ofResearchAndPrototypes
...
Conflicts:
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/stacks/sheets/leather.dm
code/game/objects/items/stacks/sheets/mineral.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/items/weapons/kitchen.dm
code/modules/hydroponics/trays/tray_tools.dm
code/modules/research/circuitprinter.dm
code/modules/research/protolathe.dm
code/modules/research/rdconsole.dm
2015-05-22 19:26:39 +03:00
PsiOmega
e74c0e65bf
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/power_cells.dm
2015-05-22 08:26:13 +02:00
Kelenius
35a20002c6
Merge branch 'dev' into ofResearchAndPrototypes
...
Conflicts:
baystation12.dme
code/defines/obj/weapon.dm
code/game/mecha/equipment/tools/medical_tools.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/mecha.dm
code/game/mecha/mecha_parts.dm
code/game/objects/items/devices/flash.dm
code/game/objects/items/devices/powersink.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
code/game/objects/items/weapons/circuitboards/machinery/power.dm
code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
code/game/objects/items/weapons/circuitboards/machinery/research.dm
code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
code/game/objects/items/weapons/flamethrower.dm
code/game/objects/items/weapons/handcuffs.dm
code/game/objects/items/weapons/kitchen.dm
code/game/objects/items/weapons/shields.dm
code/game/objects/items/weapons/storage/backpack.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/objects/items/weapons/teleportation.dm
code/game/objects/items/weapons/tools.dm
code/modules/assembly/igniter.dm
code/modules/assembly/infrared.dm
code/modules/assembly/mousetrap.dm
code/modules/assembly/proximity.dm
code/modules/assembly/signaler.dm
code/modules/assembly/timer.dm
code/modules/assembly/voice.dm
code/modules/clothing/glasses/glasses.dm
code/modules/hydroponics/trays/tray_tools.dm
code/modules/mining/drilling/scanner.dm
code/modules/mining/mine_items.dm
code/modules/mining/ore.dm
code/modules/mob/living/silicon/robot/analyzer.dm
code/modules/power/rust/circuits_and_design.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/projectiles/guns/energy/laser.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/energy/stun.dm
code/modules/research/circuitprinter.dm
code/modules/research/designs.dm
code/modules/research/destructive_analyzer.dm
code/modules/research/protolathe.dm
code/modules/research/rdconsole.dm
code/modules/research/research.dm
code/modules/research/server.dm
code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
2015-05-20 11:50:28 +03:00
mwerezak
defc4c1f94
Adds check_charge(), checked_use()
2015-05-18 20:09:09 -04:00
mwerezak
53855d2398
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into charge
2015-05-18 18:47:45 -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
Chinsky
2359245f06
Merge pull request #9285 from mwerezak/master-fixes
...
Pneumatic cannon fix
2015-05-16 14:19:22 +03:00
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
ccomp5950
19cc6df391
Conversion to admin_attack_log()
2015-05-15 17:07:07 -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
ccomp5950
735202d409
Admin log fix: Something that really annoys ravensdale.
...
<Ravensdale1> [X] has shot [y] with a the bullet
http://i.imgur.com/F54KjJ3.png
2015-05-14 21:07:36 -04: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
PsiOmega
b52cf35680
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/projectiles/projectile.dm
2015-05-12 13:40:47 +02:00
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
ccomp5950
569e785014
Holodeck items no longer spam admin attack logs.
...
/obj/items now has no_attack_log variable if set to 1, it won't log.
All holodeck items and lasertag weapons have no_attack_log set.
<3 Mangled
2015-05-11 22:11:46 -04:00
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
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
Chinsky
d0c2b883aa
Merge pull request #9069 from RavingManiac/dev
...
Muzzle-flash lighting effect for guns
2015-05-06 17:27:21 +03:00
PsiOmega
151c5204ee
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/modules/projectiles/gun.dm
html/changelogs/RavingManiac-master.yml
2015-05-05 08:11:28 +02:00
Kelenius
873b38e0a5
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/game/objects/effects/chem/chemsmoke.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
2015-05-04 22:36:35 +03:00
Kelenius
33dde892e2
Fixes a few log-destroying lines
2015-05-04 21:33:30 +03: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
PsiOmega
990b7b81a8
Another potential qdel sanity check.
2015-04-30 14:37:52 +02:00
PsiOmega
40f0901e3d
Fixes #9037 .
...
Just one of many potential qdel issues. More to come, yay.
2015-04-30 09:35:57 +02: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
9d9de73f03
Firemode bugfixes
2015-04-28 02:09:39 -04:00
mwerezak
472b284f24
Adds hitscan to the heavy sniper projectile
2015-04-28 02:08:12 -04: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
Chinsky
afa82e5d83
Merge pull request #9003 from mwerezak/dev-fixes
...
Fixes
2015-04-28 06:26:22 +03:00
mwerezak
529a0e3fe9
Fixes #8992
2015-04-27 00:37:16 -04:00
mwerezak
549270c73c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color
...
Conflicts:
code/game/machinery/washing_machine.dm
code/modules/mob/living/carbon/human/update_icons.dm
2015-04-26 14:53:01 -04:00
Chinsky
5f30d0fa9a
Merge pull request #8982 from PsiOmegaDelta/Bullets
...
Adds practice rounds.
2015-04-26 20:06:37 +03:00
