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 |
|
Zuhayr
|
e27eda4c86
|
Merge pull request #10672 from mwerezak/frag-grenade
Adds fragmentation grenades
|
2015-09-07 14:12:27 +09:30 |
|
Zuhayr
|
0c56bdd448
|
Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
Makes it possible to define multiple tag pairs for the Travis check.
|
2015-09-07 13:57:09 +09:30 |
|
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
|
3a5412df3a
|
Merge pull request #190 from PolarisSS13/master
Master to Dev 9/6/2015
|
2015-09-06 17:30:54 -04:00 |
|
Neerti
|
0451544692
|
Update nuclear.dm
|
2015-09-06 16:43:25 -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 |
|
PsiOmega
|
e48fbdd1e6
|
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
Conflicts:
code/game/machinery/newscaster.dm
code/modules/admin/admin.dm
|
2015-08-21 20:27:48 +02:00 |
|
mwerezak
|
4396e5a5bc
|
Merge pull request #9891 from Zuhayr/dev
Adds variables for CentComm, NanoTrasen and the station name.
|
2015-08-21 14:23:57 -04:00 |
|
Zuhayr
|
56131e1053
|
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate
Conflicts:
code/modules/clothing/clothing.dm
|
2015-08-22 03:17:16 +09:30 |
|
Zuhayr
|
3c477dfa5e
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
code/game/jobs/access.dm
code/modules/mob/living/carbon/brain/brain_item.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
|
2015-08-22 03:11:53 +09:30 |
|
Zuhayr
|
bb82f80885
|
Added get_bodytype() species proc as groundwork for subspecies.
Conflicts:
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
|
2015-08-22 02:53:16 +09:30 |
|
Zuhayr
|
edf74e4721
|
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
code/modules/admin/topic.dm
|
2015-08-22 02:30:14 +09:30 |
|
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 |
|
Zuhayr
|
bf313ae238
|
Merge pull request #9851 from mwerezak/armourpen
Adds armor penetration system
|
2015-08-22 02:22:17 +09:30 |
|
Zuhayr
|
3bfa541612
|
Adds variables for CentComm, NanoTrasen and the station name.
|
2015-08-22 02:10:11 +09:30 |
|
Kelenius
|
bed03443d1
|
Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
code/ZAS/Airflow.dm
code/__defines/items_clothing.dm
|
2015-08-21 16:15:07 +03:00 |
|
SinTwo
|
9b51c352ae
|
AS-24 Fix #2 + ignore
Ignore hides database config for hopeful database fix(?)
|
2015-08-18 18:09:48 -04:00 |
|
PsiOmegaDelta
|
5fbe0819b7
|
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
Conflicts:
code/game/machinery/Sleeper.dm
|
2015-08-17 13:05:58 +02: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 |
|
mwerezak
|
77ddae4e26
|
Structures now take damage properly from projectile clouds
|
2015-08-15 19:08:45 -04:00 |
|
mwerezak
|
8b08f8ff34
|
Fixes explosions deleting projectiles
|
2015-08-15 02:51:02 -04:00 |
|
mwerezak
|
4092b40ae5
|
Updates frag grenades to use bresenham, tweaks
|
2015-08-15 02:41:32 -04:00 |
|
HarpyEagle
|
6404d02c38
|
Adds changelog and tweaks PTR penetration.
|
2015-08-15 02:19:23 -04:00 |
|
mwerezak
|
da58494275
|
Improves the way shrapnel clouds hit prone mobs
|
2015-08-14 00:25:41 -04:00 |
|
Chinsky
|
822d48928b
|
Fixes caps getting stuck in air forever.
Also apparently just being nodamage 0 damage non-sharp bullet is not enough to stop suicide from working -_-.
|
2015-08-14 06:19:35 +03: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 |
|
HarpyEagle
|
2e8f927085
|
More descriptive variable name
Renames armorpen to armor_penetration
|
2015-08-13 22:38:28 -04:00 |
|
mwerezak
|
0cf21df8b5
|
Adjusts projectile values
|
2015-08-13 22:37:47 -04: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 |
|
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 |
|
Chinsky
|
21f7c8234d
|
Merge pull request #10473 from mwerezak/firemode-cleanup
Streamlines gun fire modes
|
2015-08-13 07:22:28 +03:00 |
|
GinjaNinja32
|
631ff21980
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/objects/items/weapons/implants/implantcase.dm
code/game/objects/items/weapons/melee/energy.dm
code/modules/mob/living/carbon/human/emote.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/silicon/robot/drone/drone.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/nano/modules/crew_monitor.dm
code/modules/organs/organ_internal.dm
|
2015-08-11 18:47:05 +01:00 |
|