Neerti
25c04df5bd
Polaris tweaks.
...
Fixes mistake involving belts.
Fixes mistake involving bags allowing w_class 5 items, which was from the manual merge.
Polaris tweaks
Makes inflatables w_class 3.
Spacesuits and RIGs are now w_class 5.
Both sniper weapons are now w_class 5.
Makes more inventories able to use the volume based system.
Cleans up the cig part of the port a bit.
2016-04-06 07:48:09 -04:00
Neerti
75c0c5cc38
Changes lots of gun stuff, see PR for details.
2016-03-30 03:41:54 -04:00
Mark9013100
e62863e1b3
Renames the security .45
2016-03-22 23:03:21 -04:00
Kelenius
afbc235b96
Mob inventory cleanup
2016-03-15 16:39:40 +03:00
Zuhayr
a628ae2a56
Removed the Vox Pox.
2016-02-20 11:24:19 +10:30
Zuhayr
ab9574ee06
Fixing some infinite loops in gun update_icon() calls.
2016-01-22 04:27:00 +10:30
Mark9013100
a4b891f5ef
Replaces the standard .45 pistol with the Detective's.
2015-12-20 15:36:26 -05:00
Neerti
c56e6d173c
Merge pull request #463 from Sabess/master
...
Added more reskins for the M1911 and some other stuff.
2015-12-08 08:15:19 -05:00
EmperorJon
2dc59a5c96
Merge pull request #469 from EmperorJon/07_Dec._Fix_SMG_desc
...
Changes 12mm to 10mm.
2015-12-07 23:59:50 +00:00
Jon
ef987c5124
Changes 12mm to 10mm.
2015-12-07 23:59:11 +00:00
sabess
7e0a8f9145
Fixed notes, oops
2015-12-07 18:31:53 +11:00
sabess
76a11a1fd0
Fixed stuff
2015-12-07 18:11:17 +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
Neerti
e0986cb7ab
Ballistic weapons will now correctly say that the firing mode was changed.
2015-12-02 08:04:34 -05:00
Neerti
062a092cfe
Refactors how armor works. It's now less of a dice roll, but still retains some randomness. This makes weaker armor worth using, and stronger armor not godlike.
...
Also fixes a bug with the auto shotgun causing runtimes.
2015-12-01 03:45:47 -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
Datraen
39d384cbe4
Makes Deckard's gun usable.
2015-10-14 19:05:14 -04:00
Mark9013100
ce4b21550a
Edits the Z8, L6, and A12
...
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
2015-10-11 00:44:47 -04:00
Mark9013100
0714ce3f93
Update automatic.dm
2015-10-11 00:44:22 -04:00
Mark9013100
fa361890ff
Minor change to the auto shotgun and SAW
...
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
icons/obj/rig_modules.dmi
2015-10-11 00:44:18 -04:00
Mark9013100
488ebc89b2
Balances fm-t2, nerfs burstfire
...
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
2015-10-11 00:42:26 -04:00
Mark9013100
3cc7a77846
The detective colt can now be reskinned
...
Conflicts:
code/modules/projectiles/guns/projectile/pistol.dm
2015-10-11 00:30:06 -04:00
Neerti
e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -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
Neerti
a9dda6cf3f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
...
Conflicts:
.travis.yml
code/game/gamemodes/cult/cult.dm
code/game/gamemodes/heist/heist.dm
code/game/gamemodes/ninja/ninja.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/gamemodes/wizard/wizard.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/objects/structures/lattice.dm
code/global.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/reagents/Chemistry-Recipes.dm
config/example/config.txt
polaris.dme
2015-09-06 18:26:06 -04:00
Neerti
b93595c19f
Merge branch 'master' into 9/4/2015_master_to_dev
...
Conflicts:
code/game/jobs/job/security.dm
code/modules/projectiles/guns/energy/nuclear.dm
code/modules/projectiles/guns/projectile/automatic.dm
maps/colony-1.dmm
maps/colony-5.dmm
2015-09-04 08:43:37 -04:00
SinTwo
4e360779ed
Guns, Coats, and Hair Oh My
...
Hair gender fix, the attack of the multicolor labcoats and hoodies, and
the addition of a new SMG E-Gun.
2015-09-03 19:51:26 -04:00
PsiOmegaDelta
7bcf9aaea9
Merge pull request #10340 from comma/russian_roulette
...
Russian roulette and russian roulette accessories
2015-09-03 19:40:01 +02:00
Chinsky
28cf860332
Adds revolver spin sound.
2015-09-01 12:18:49 +03:00
Neerti
7fab70767d
colony-1 could not be saved, unfortunately. RIP
2015-08-23 18:04:47 -04:00
Neerti
00fa623c9d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/machinery/Sleeper.dm
code/game/machinery/computer/communications.dm
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/global.dm
code/modules/materials/materials.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/projectiles/guns/projectile/automatic.dm
polaris.dme
2015-08-23 01:30:46 -04:00
Zuhayr
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
SinTwo
9b51c352ae
AS-24 Fix #2 + ignore
...
Ignore hides database config for hopeful database fix(?)
2015-08-18 18:09:48 -04:00
SinTwo
5b1b79df6d
Fixes/Adds AS-24 Shotgun
2015-08-16 21:36:36 -04:00
SinTwo
14b2114598
AS-24 Shotgun
...
Adds the AS-24 Shotgun.
2015-08-16 19:28:06 -04:00
Chinsky
b01a41d766
Merge branch 'capgun' into russian_roulette
2015-08-14 06:03:33 +03:00
Chinsky
b4ec03b871
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into russian_roulette
2015-08-14 05:57:00 +03:00
Chinsky
328621b860
Moved cap guns to proper guns.
2015-08-14 05:51:29 +03:00
Chinsky
94f0ceffe1
Merge pull request #10200 from mwerezak/gun-desc
...
Renames of various firearms (squashed version)
2015-08-14 03:55:43 +03: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
Chinsky
b362be9bb1
Russian roulette
...
Fun for whole sec team!
2015-07-29 16:15:24 +03:00
Dragor
697157a6bc
Changes all gun names to generic descriptive names, moves names into desc. Updates the descriptions of various guns to be more loreful.
2015-07-15 22:08:21 -04: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
508827580c
Formatting
2015-07-04 22:39:09 -04:00
mwerezak
fad0a712d8
Expands raider gear list
2015-07-04 15:39:31 -04:00
mwerezak
cf5e4a17d6
Adds raider gun type, fixes sawn shotgun inhands
...
Also adds type def to allow spawning sawn shotguns.
2015-07-04 15:39:05 -04:00
PsiOmegaDelta
405131a54e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/projectiles/guns/energy/stun.dm
code/modules/projectiles/guns/projectile/pistol.dm
code/modules/projectiles/guns/projectile/revolver.dm
2015-06-20 20:40:06 +02:00
HarpyEagle
b26edd690c
Certain sidearms now use the lighter gunshot sound
2015-06-17 09:59:40 -04: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
