Kelenius
afbc235b96
Mob inventory cleanup
2016-03-15 16:39:40 +03:00
Zuhayr
7c3993b68b
Revert "Revert "Bay update.""
2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c
Revert "Bay update."
2016-02-07 16:07:05 +10:30
Zuhayr
d5b904ca2a
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
2016-01-26 11:11:55 +10:30
Zuhayr
ab9574ee06
Fixing some infinite loops in gun update_icon() calls.
2016-01-22 04:27:00 +10:30
Zuhayr
36c0bb0f13
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
2016-01-22 01:33:09 +10:30
Zuhayr
f89948d666
Added functionality for two-handed gun use.
2016-01-21 00:51:54 +10:30
Zuhayr
e557a71fdc
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2016-01-20 08:01:14 +10:30
Neerti
23aa869e8a
Revert "Removes gun firing logs due to possible lag."
2016-01-14 00:27:06 -07:00
Zuhayr
f93ea6a78f
Tweaks to previous commits.
...
More tweaks to IPC fixes.
Merge resolution/compile fixes.
Further work on properly integrating, updating and fixing prosthetic options.
Repathed internal organs to organ/internal.
More work on full synthetics, changelings, overheating.
Working on getting organs to qdel properly and spawn properly when robotized.
Finalized some overheating values, added remaining prosthetic icons.
Finalizing the testing version of the full prosthetic bodies branch.
Added suit cyclers to the autolathe and map.
Fixing runtime errors.
Fixing errors.
Changelog.
Replacing limb and organ strings with constants.
Prevented brainless species from becoming full cyborgs.
Fixed issues with brain/MMIs renaming themselves inappropriately.
Various fixes and oversights.
2015-12-24 21:13:40 +10:30
Zuhayr
6e8368ac4c
Rewrote targeting.
2015-12-16 10:26:40 +10:30
Zuhayr
0148e78eda
Removed targeting.
2015-12-16 10:25:18 +10:30
sabess
7e0a8f9145
Fixed notes, oops
2015-12-07 18:31:53 +11:00
sabess
47a6e38a8d
Added more reskins for the M1911, all of which have different sprites when empty. Added this functionality for the default M1911 as well as the default MK58s.
2015-12-07 14:25:06 +11:00
PsiOmegaDelta
6a22086c17
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/verbs/suicide.dm
code/modules/nano/modules/crew_monitor.dm
2015-12-06 11:34:36 +01:00
mwerezak
d508893e3c
Tweaks pointblank multipliers to play better with droplimb thresholds
2015-12-06 02:44:09 -05:00
mwerezak
29192fd8e8
Fixes #11466
2015-12-06 02:35:18 -05:00
Neerti
e0986cb7ab
Ballistic weapons will now correctly say that the firing mode was changed.
2015-12-02 08:04:34 -05:00
Neerti
602493cc08
Removes gun firing logs due to possible lag.
2015-12-01 14:12:35 -05:00
Neerti
5b59945032
Fixes gun aiming, adds logging for aiming and firing, and ballistic weapons should no longer be named 'the three round burst' or such.
2015-11-29 12:44:10 -05:00
Neerti
05ec2e7c28
Fixes gun mode switching.
2015-11-19 07:27:34 -05:00
Neerti
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
HarpyEagle
7f066065d3
Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-10-05 19:20:33 -04:00
GinjaNinja32
c8eb26326a
Merge pull request #11208 from mwerezak/firemode-cleanup
...
Fixes #10850
2015-09-28 11:41:03 +01:00
mwerezak
13c184c2a8
Fixes #10850
2015-09-27 14:13:37 -04:00
mwerezak
af52b475ff
Fixes missing cooldowns, missing cult blade sound.
2015-09-09 15:15:43 -04:00
PsiOmega
d001489d14
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/modules/admin/topic.dm
2015-08-21 18:59:19 +02:00
PsiOmegaDelta
77d0bbd643
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/gamemodes/changeling/modularchangling.dm
2015-08-13 08:09:28 +02:00
Kelenius
60196df634
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/modules/projectiles/gun.dm
2015-08-13 08:40:31 +03:00
Chinsky
ac80136603
Merge pull request #10184 from mwerezak/projectile-cleanup
...
Projectile code cleanup
2015-08-13 07:26:58 +03:00
HarpyEagle
8cbd14c1a5
Splits up projectile/launch()
2015-08-10 19:00:38 -04:00
HarpyEagle
ad54aca3ab
Streamlines gun firemodes
...
Gun firemodes now work by setting vars on the parent gun item. Removes the
need to unpack a bunch of firemode values when shooting and the need for
certain guns to define special firemode types.
2015-08-10 14:38:08 -04:00
PsiOmegaDelta
0ba7643217
Updates files as necessary to adhere to the new standard.
2015-07-27 09:32:51 +02:00
PsiOmega
cee5f1a057
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items.dm
2015-07-06 18:33:09 +02:00
mwerezak
8d1e669588
Shooting while on help intent no longer auto switches to hostage mode
2015-07-04 10:47:56 -04:00
mwerezak
06000a6984
Adds setMoveCooldown()
2015-06-30 22:30:12 -04:00
mwerezak
32b95445e3
Gives changeNextMove() a better name, default define
2015-06-30 22:29:45 -04:00
Kelenius
0071ed3f24
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/_onclick/click.dm
code/_onclick/telekinesis.dm
code/game/machinery/deployable.dm
code/game/objects/items.dm
code/game/objects/structures/grille.dm
code/modules/mob/living/simple_animal/simple_animal.dm
code/setup.dm
2015-06-07 14:05:54 +03:00
PsiOmega
fc6de24042
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/materials/material_sheets.dm
code/modules/organs/organ_icon.dm
code/setup.dm
2015-06-07 10:51:41 +02: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
Kelenius
6d54e1c655
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/game/turfs/simulated/walls.dm
code/modules/mob/living/carbon/resist.dm
code/modules/mob/mob_grab.dm
2015-05-21 17:00:50 +03: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
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
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
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
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
