8e42db3e7f
More guns for the gun box
...
- NT Mk98 (re)added.
- P92X added.
2018-01-18 18:53:43 -05:00
ff228754b3
Merge polaris sync 01 17 2018
...
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
f2fef6f410
Planes Framework ( #4545 )
...
* Polaris initial plane upstream merge
* POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT
* POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.
* POLARIS: Adds a 'alter values' proc for plane master ease of tweaking
Setting stuff like colorblindness variety and things.
* Remove NIF reference, fix lighting layer define
* Handle effects above lighting plane
* Moved all layer defines to planes+layers.dm
* Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE
* Merge: 3000% human/update_icons() speed improvement
* Merge: Avoid ghosts pointing at things
2018-01-17 13:45:54 -06:00
0a037f0fe0
Merge pull request #2755 from VOREStation/polaris-sync-2018-01-10
...
Polaris Sync 2018 01 10
2018-01-16 02:46:25 -05:00
10aabd98da
POLARIS: 3000% human/update_icons() improvement
...
Using overlays in lists and a mutable_appearance
2018-01-15 21:39:47 -05:00
5d5f052eb7
Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10
...
# Conflicts:
# code/game/machinery/atmoalter/area_atmos_computer.dm
2018-01-15 13:27:39 -05:00
b441ccd6e3
9mm pistol updates ( #4480 )
...
* These aren't supposed to be here!!
* Adds new Security pistol and large capacity magazines
* Removes new pistol from Security spawns
* Removed references of Beretta because it's not one
2018-01-14 14:45:15 -06:00
36f8c56537
Fixes 'varient'
2018-01-08 16:42:20 -05:00
28c193cbdb
Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
...
# Conflicts:
# code/game/objects/items/devices/communicator/communicator.dm
# code/modules/client/preference_setup/occupation/occupation.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/mob_helpers.dm
# code/unit_tests/zas_tests.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-01-04 22:44:04 -05:00
53372f4317
Tweak out-of-ammo behavior on railguns
...
I personally like to imagine we live in a world where 'eject' is not a synonym for 'annihilate'.
Just makes the sound the railguns play when empty be a var, and makes them ACTUALLY eject the magazine instead of just deleting it (copypaste error probably, from the magnetic type, which does that).
2017-12-28 18:02:43 -05:00
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
c0615e47cf
Merge pull request #4437 from Belsima/whatifgammer
...
more grammer
2017-12-12 19:31:06 -06:00
430746d863
more grammer
2017-12-11 20:33:59 -05:00
a841d57239
Changes the Laser Carbine/Rifle
2017-12-05 23:36:05 -06:00
01aaccf893
Finishes UFO PoI
2017-11-26 15:10:25 -05:00
7497aef295
work
2017-11-26 12:08:05 -05:00
845eae4c65
Merge pull request #4322 from Anewbe/fuck_mosin
...
Removes the mosin-nagant, moves the sprites
2017-11-23 03:32:37 -05:00
6e3bbd31c0
Removes the mosin-nagant, moves the sprites
2017-11-22 01:14:14 -06:00
62d76cba30
Merge pull request #4318 from Mechoid/Mechoid_Has_The_Keys_And_A_Brick_On_The_Pedal
...
Adds more Spiders. Touches cuff-code tangentially.
2017-11-22 01:13:04 -06:00
d5404ae0eb
Adds More Spiders. Touches cuff-code tangentially.
2017-11-21 12:59:06 -08:00
fea8fcc064
Merge pull request #4310 from Neerti/11/19/2017_hunting_rounds
...
Adds Hunting Rounds
2017-11-21 00:29:12 -06:00
4739f04c5d
Merge pull request #4308 from SpadesNeil/shotgun-clip-rebalance
...
Shotgun clip rebalance
2017-11-21 00:18:01 -06:00
9db34eae86
Adds Hunting Rounds
...
Adds a system for projectiles to inflict additional damage on specific kinds of simple animals.
Adds special bullets for certain rifles which are very effective against 'animal' SAs such as giant spiders, bears, carp, and such. The bullets do less damage to other targets such as humanoids.
Replaces the southern cross gun locker regular ammo with hunting ammo.
2017-11-19 23:59:17 -05:00
d36d09d937
Merge pull request #4176 from Anewbe/battery_things
...
Swaps non-mounted recharging guns to batteries
2017-11-19 21:28:06 -05:00
79d3ee82ab
Shotgun clip rebalance
...
An alternative solution to the problem I highlighted in
https://github.com/PolarisSS13/Polaris/pull/4302
If this is merged, **do not merge**
https://github.com/PolarisSS13/Polaris/pull/4303
2017-11-19 14:08:03 -05:00
fd7990028f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into battery_things
2017-11-19 02:38:42 -06:00
b2917b9716
Tones down the Darkmatter Beam
2017-11-17 20:15:53 -06:00
70e53b96bb
Polaris Sync
2017-11-10 11:37:41 -05:00
77e4aa2cf4
fixed a thing
2017-11-07 21:40:00 +11:00
c96781499f
Allows detectives to take an optional revolver + some other stuff ( #4217 )
...
* I'm like 99% sure this works
* uhm
* accidentally broke something after I tested but before I PRed, fixed now
2017-11-05 22:53:11 -06:00
c9cbbd3a9b
Swaps non-mounted recharging guns to batteries
2017-10-27 20:43:31 -05:00
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
4eb5e9b6d0
Can't aim at invisible things
2017-10-23 12:11:11 -05:00
7a36a8cfb6
Merge pull request #4118 from mistyLuminescence/cryostorage
...
Reworks cryopod storage
2017-10-22 19:03:07 -05:00
48d8375cac
Incendiary >= 2 projectile fixes. ( #4127 )
...
* A whole load of things.
* Fixes the SM Rod's travel distance.
* Flame it again, Tony. Fixes flamefuel spawning on rock-wall turf.
2017-10-22 00:26:33 -05:00
ae308a3a91
Reworks cryopod storage
2017-10-20 19:14:45 +01:00
9c0ac5ec2a
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/20/2017_syndie_borgs_are_back
2017-10-20 13:26:06 -04:00
1aff3fc8c0
Syndicate Borgs II, Return of the Salt
...
Adds an option in mercenary uplinks to purchase three different 'classes' of drones.
See PR for more details.
2017-10-20 13:01:45 -04:00
920e823a46
Fuel-Rod Gun, Minor fixes related. ( #4103 )
...
* A whole load of things.
* Fixes the SM Rod's travel distance.
2017-10-19 15:07:52 -05:00
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
b14766ff92
Merge pull request #4078 from Mechoid/Projectile_Turretfunctions
...
Turret Targetting Update
2017-10-16 14:03:05 -05:00
9a04744ab6
Turrets detect targets through metal foam.
2017-10-15 13:48:38 -07:00
aac1ab0bb7
Dead bodies are no longer perfect shields.
2017-10-14 21:41:15 -07:00
0a3d85647a
Merge pull request #4011 from Anewbe/railgun
...
Ports Bay's railguns, and assorted gun sprites
2017-10-14 01:43:45 -04:00
56ec5ec94c
Adds three flame-themed illegal Mech weapons and more. ( #4058 )
...
* Adds three flame-themed illegal Mech weapons. Allows anything using apply_effects to be incendiary and ignite/apply firestacks. Also absolute-paths the spilled fuel effects.
* Removes world << because I'm a good coder honest.
* Why does Git do this for no reason.
2017-10-13 23:32:52 -05:00
a8513844ec
Adds a Trait system ( #4048 )
...
* Works on trait system, wip.
* Finalizes traits.
Fixes a few bugs with medical machines assuming a max health of 100.
2017-10-13 01:17:39 -05:00
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
ff7c4fe45a
Makes a bunch of things fit in holsters
2017-10-07 17:24:18 -05:00
a248a4a4a1
Ports Bay's railguns, and assorted gun sprites
2017-10-02 17:29:24 -05:00
96190e94aa
Allows emitters to blast through rocks again.
2017-09-29 01:05:40 -04:00
Spades