Leshana
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
Cyantime
36f8c56537
Fixes 'varient'
2018-01-08 16:42:20 -05:00
Leshana
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
Arokha Sieyes
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
killer653
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
Anewbe
c0615e47cf
Merge pull request #4437 from Belsima/whatifgammer
...
more grammer
2017-12-12 19:31:06 -06:00
Belsima
430746d863
more grammer
2017-12-11 20:33:59 -05:00
Anewbe
a841d57239
Changes the Laser Carbine/Rifle
2017-12-05 23:36:05 -06:00
Neerti
01aaccf893
Finishes UFO PoI
2017-11-26 15:10:25 -05:00
Neerti
7497aef295
work
2017-11-26 12:08:05 -05:00
Anewbe
6e3bbd31c0
Removes the mosin-nagant, moves the sprites
2017-11-22 01:14:14 -06:00
Neerti
d36d09d937
Merge pull request #4176 from Anewbe/battery_things
...
Swaps non-mounted recharging guns to batteries
2017-11-19 21:28:06 -05:00
Anewbe
fd7990028f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into battery_things
2017-11-19 02:38:42 -06:00
Anewbe
b2917b9716
Tones down the Darkmatter Beam
2017-11-17 20:15:53 -06:00
killer653
70e53b96bb
Polaris Sync
2017-11-10 11:37:41 -05:00
sabess
77e4aa2cf4
fixed a thing
2017-11-07 21:40:00 +11:00
Sabess
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
Anewbe
c9cbbd3a9b
Swaps non-mounted recharging guns to batteries
2017-10-27 20:43:31 -05:00
killer653
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
Neerti
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
Neerti
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
Mechoid
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
killer653
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
Neerti
0a3d85647a
Merge pull request #4011 from Anewbe/railgun
...
Ports Bay's railguns, and assorted gun sprites
2017-10-14 01:43:45 -04:00
Cameron Lennox
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
Anewbe
ff7c4fe45a
Makes a bunch of things fit in holsters
2017-10-07 17:24:18 -05:00
Anewbe
a248a4a4a1
Ports Bay's railguns, and assorted gun sprites
2017-10-02 17:29:24 -05:00
Cyantime
96190e94aa
Allows emitters to blast through rocks again.
2017-09-29 01:05:40 -04:00
Anewbe
6d0e6c4b0f
Merge pull request #3757 from SpadesNeil/Ace-infuriates-Anewbe-with-another-vintage-weapon
...
Adds M1 Garand
2017-09-26 01:09:46 -05:00
Anewbe
c80b535a29
Merge pull request #3902 from Neerti/9/19/2017_lost_drone
...
Adds the Lost Drone
2017-09-22 15:24:05 -05:00
Neerti
afd7b15442
Adds the Lost Drone
2017-09-22 01:17:53 -04:00
killer653
2755d3ddb1
HOTFIX
2017-09-21 20:26:48 -04:00
Anewbe
61936496b1
Merge pull request #3813 from Belsima/clickityclack
...
Adds a metric assload of sounds.
2017-09-20 22:20:17 -05:00
Spades
32c79939b6
More merging updates
2017-09-19 23:58:40 -04:00
killer653
bddfa16f82
Polaris sync
2017-09-15 21:17:34 -04:00
Anewbe
7cc1506901
Merge pull request #3810 from Mechoid/Dart_Gun_2_Dart_Harder
...
Fixes the Dartgun, makes a Research-Produceable variant.
2017-09-11 17:38:19 -04:00
Anewbe
096159ac37
Merge pull request #3796 from ghost/hephaestus
...
Standardizes spellings to wiki and adds more major corps and places to setup.
2017-09-11 17:19:55 -04:00
Anewbe
42e8bb6284
Merge pull request #3767 from Neerti/8/10/2017_make_xenobio_old_again
...
Make Xenobiology Old(ish) Again
2017-09-10 17:12:38 -04:00
Belsima
1fc7bc7674
Adds a metric assload of sounds.
2017-09-10 14:34:43 -04:00
Mechoid
2a5311e063
Fixes the Dartgun, makes a Research-Produceable variant.
2017-09-09 21:25:30 -07:00
Spades
72c249f0ef
Weapon sound improvements from TG, take 2 ( #3772 )
...
* Sound Improvements
Ported some sounds from TG. I was getting sick of the current pistol
sound. Didn't sound meaty enough so I changed it.
I also didn't like the default gun firing sound so I changed that too.
I also brought in a couple more sound files from TG just in case those
ever get used. No use for them currently.
While I was at it, I fixed the incorrect naming of some sound files in
audible_deception.dm for Technomancers because I was editing the file
anyway and a separate PR would make conflicts.
* I forgot to press save on this one
I tend to do that a lot
* Laser sound too.
* Adds back commented out code because reasons
2017-09-09 15:40:26 -04:00
Belsima
022eb8cf4c
Standardizes spellings to wiki and adds more major corps and places to setup.
2017-09-09 12:20:08 -04:00
Neerti
8f00965cc2
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again
...
# Conflicts fixed:
# code/modules/admin/topic.dm
# code/modules/admin/verbs/debug.dm
# code/modules/admin/view_variables/helpers.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/transform_procs.dm
# maps/northern_star/polaris-1.dmm
# polaris.dme
2017-09-05 00:58:27 -04:00
Neerti
4bfcec55f2
work
2017-09-04 21:52:47 -04:00
Spades
bf771d3d0d
Grammar error
2017-09-01 04:46:44 -04:00
Spades
9b7ccae9c9
Fixes Colt pistol not switching icons when empty.
...
The "Detective" pistol worked fine but the base Colt did not. This fixes
both.
2017-09-01 03:11:12 -04:00
Spades
13a83743a3
update_icon
2017-09-01 03:09:32 -04:00
Spades
4cae6368a2
Adds M1 Garand
2017-09-01 03:03:03 -04:00
killer653
cafac8efae
Polaris Sync
2017-08-28 20:52:11 -04:00
Anewbe
676fb6daf6
Merge pull request #3694 from SpadesNeil/gun-stuff
...
Gun stuff. Some fixes, some changes, and a shiny new SVD
2017-08-20 11:21:50 -04:00
