c391a58ab2
Merge pull request #1909 from Yoshax/heavyguns
...
Heavy weapons changes
2016-06-27 00:09:18 -04:00
6db7f306c0
Removes self-recharge
2016-06-17 21:53:26 +01:00
e650531dba
Desert Eagle empty icons added.
2016-06-14 16:17:25 -04:00
1856897894
Heavy weapons changes
2016-06-10 18:34:58 +01:00
e51da6c35b
Renamed SVD mag to be consistent per request.
...
It's just a 10 round 762 magazine. It's compatible with the STS.
2016-06-06 22:03:03 -04:00
3b44024e88
Reverts ammo change, fixes P90
2016-06-05 17:55:39 -04:00
a5c615cbd1
Merge pull request #1872 from Anewbe/energy_burst_change
...
Tweaks FM-2t to possibly be usable
2016-06-05 13:58:32 -04:00
9da3e9bac7
Comment corrections to clear confusion.
2016-06-05 13:18:07 -04:00
037271504e
No five-round burst! I thought I removed these!
2016-06-04 01:36:56 -04:00
cdb5966576
Tweaks FM-2t to possibly be usable, fixes its single-shot mode, too
2016-06-03 23:58:00 -05:00
c173d0dbb7
The last commit.
2016-06-03 21:01:53 -04:00
a063c8915e
Feedback based on meeting.
...
- Removed carbine from the cargo.
- Removed SVD.
- Removed FiveSeven. Added sprite to gun resprites.
2016-06-03 20:21:12 -04:00
dd0c3935e7
Gun lore updates.
...
Also changed the path of the bullpup rifle.
2016-06-03 10:33:04 -04:00
e0748c8261
Response to feedback.
...
Tried to make descriptions better.
SAW magazine no longer fits in pockets.
2016-06-03 01:57:13 -04:00
0d5b943db7
Github client being stupid. Changed these names too.
2016-06-02 17:19:57 -04:00
c6b650afa5
Changed some new gun names based on feedback.
...
People prefer fantasy names for modern guns! Left names like the Mosin
and Tommygun because they're too ironic to change, even in the 26th
century.
2016-06-02 17:16:21 -04:00
093ab24339
Few quick fixes
...
- Fixes shotgun magazine icon.
- SAW uses correct sound.
- Shotgun revolver uses correct sound.
- Mosin has a back sprite now. Placeholder.
2016-06-02 14:32:37 -04:00
ff87150c3d
Let's just have the one commit this time because I'm no longer paranoid of losing progress.
2016-06-01 12:48:48 -04:00
cbd4915420
Merge pull request #1592 from Anewbe/borg_changes
...
Various Borg Changes
2016-05-28 12:44:27 -04:00
d2b43bd5a4
Prevents the Robocalypse
2016-05-22 14:51:35 -05:00
3fb4620199
Merge pull request #1395 from ParadoxSpace/BuffsAdminGuns
...
Buffs Back Pulse Rifles
2016-05-11 01:51:13 -04:00
ac3ce2e7d1
Makes borgs more versatile
2016-05-07 23:52:03 -05:00
beda3185eb
Reverts the second mob clean up because of incomplete implementation.
...
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
3baf91b46e
Merge pull request #1307 from Neerti/3/30/2016_dumb_gun_balance
...
Dumb Gun Balance Patch
2016-05-01 17:42:25 -04:00
98badae45f
Merge branch 'master' into cleanupTwo
2016-04-21 11:41:32 +03:00
3c92193bf5
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance
...
# Conflicts resolved:
# code/modules/projectiles/projectile/beams.dm
2016-04-20 05:41:36 -04:00
482316ed55
Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port
...
Ports Bay's new inventory system.
2016-04-16 02:58:07 +01:00
582fd09624
Update pulse.dm
2016-04-09 18:09:35 -06:00
d2318ca1b2
Spike regen rate changed
2016-04-07 16:38:42 -05:00
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
75c0c5cc38
Changes lots of gun stuff, see PR for details.
2016-03-30 03:41:54 -04:00
df5a0d7941
Mob inventory cleanup
...
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
e62863e1b3
Renames the security .45
2016-03-22 23:03:21 -04:00
afbc235b96
Mob inventory cleanup
2016-03-15 16:39:40 +03:00
a628ae2a56
Removed the Vox Pox.
2016-02-20 11:24:19 +10:30
129965b1c4
Adds a variable to check for grenade loading, makes frags unloadable.
2016-02-16 12:58:17 -05:00
7c3993b68b
Revert "Revert "Bay update.""
2016-02-07 16:33:30 +10:30
98d983577c
Revert "Bay update."
2016-02-07 16:07:05 +10:30
d5b904ca2a
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
2016-01-26 11:11:55 +10:30
ab9574ee06
Fixing some infinite loops in gun update_icon() calls.
2016-01-22 04:27:00 +10:30
e557a71fdc
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2016-01-20 08:01:14 +10:30
6b77ec868e
antique laser description typo fix
...
there wasn't a period this adds a period
2016-01-16 18:02:41 -06:00
a4b891f5ef
Replaces the standard .45 pistol with the Detective's.
2015-12-20 15:36:26 -05:00
f382626075
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/asteroid.dm
code/game/verbs/ooc.dm
code/modules/admin/verbs/icarus.dm
code/modules/mob/living/silicon/robot/robot_items.dm
code/modules/projectiles/projectile/special.dm
code/modules/random_map/random_map.dm
code/setup.dm
2015-12-13 10:15:29 +01:00
d10118e3d0
Fixes #11346
...
Fixes #8123
Removes adminbus ability to call down the Icarus... because it's pretty broken.
2015-12-12 12:03:15 -07:00
565e39a28f
Porting forensics from Aurora.
2015-12-10 19:16:28 +10:30
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
2dc59a5c96
Merge pull request #469 from EmperorJon/07_Dec._Fix_SMG_desc
...
Changes 12mm to 10mm.
2015-12-07 23:59:50 +00:00
ef987c5124
Changes 12mm to 10mm.
2015-12-07 23:59:11 +00:00
7e0a8f9145
Fixed notes, oops
2015-12-07 18:31:53 +11:00
Datraen