Sharkmare and GitHub
4aada5ee68
One shot stun gun code
2019-04-23 14:17:14 +02:00
Nadyr
3db8bb46d5
KHI guns (Protector, NSFW, Hunter-Capture) now made by Hesphaistos Industries.
2019-03-14 18:15:18 -05:00
Leshana
43b8c1720c
Adds the Kinetic Accelerator
...
A mining gun, this upgradable energy weapon can mine mineral turfs at a distance. It does only 25% of nominal damage when fired indoors.
It can be upgraded with modkits, giving it range, pretty colors, aoe against minerals or mobs.
2018-04-24 12:59:23 -04:00
Michiyamenotehifunana
2318db9cd7
Improves contrasts on sprites and removes the need for mirroring upstream sprites
2018-04-06 17:59:10 +08:00
Michiyamenotehifunana
50d7706cd2
Fixes Pathing
2018-04-05 20:21:15 +08:00
Leshana
30454ccdc3
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
...
# Conflicts:
# code/game/jobs/job_controller.dm
# code/game/machinery/oxygen_pump.dm
# code/game/objects/items/weapons/storage/firstaid.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/organs/internal/eyes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-02-23 21:55:42 -05:00
Anewbe
153009e03c
Ports more two-handed gun sprites from Bay
2018-02-21 01:57:56 -06:00
Anewbe and Atermonera
82889f60a2
Corrects a few accuracy/evasion errors ( #4864 )
2018-02-18 11:44:43 -08:00
Arokha Sieyes
5967bb6dc5
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/game/objects/items/weapons/storage/boxes.dm
# code/game/objects/items/weapons/storage/storage.dm
# code/modules/mob/living/carbon/human/species/species.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-6.dmm
2018-02-18 00:25:36 -06:00
elgeonmb and Atermonera
c359d8aae4
unions no longer make firearms ( #4836 )
2018-02-17 20:40:15 -08:00
Leshana
ef3df27528
VOREStation Specific Merge Changes
...
* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.
2018-02-17 16:56:31 -05:00
Leshana
7ed3d2c2f6
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
...
# Conflicts:
# code/_onclick/hud/screen_objects.dm
# code/game/objects/items/weapons/storage/storage.dm
# code/game/objects/structures/crates_lockers/closets/secure/medical.dm
# code/modules/admin/admin_verbs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/gloves/color.dm
# code/modules/lore_codex/codex.dm
# code/modules/mob/living/simple_animal/aliens/alien.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/goose.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/mob_defines.dm
# code/modules/projectiles/projectile/special.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-7.dmm
# vorestation.dme
2018-02-17 00:35:29 -05:00
Anewbe and Atermonera
a93cb256ec
Ports Vorestation's emp effects and ion projectiles ( #4818 )
2018-02-15 12:29:33 -08:00
Anewbe and Atermonera
534a588a6a
Gun changes ( #4185 )
...
* Various background gun changes
* Forgot to include the sounds, woops
* Fixes some more gun stuff
* Makes the cham gun work again
2018-02-12 23:12:14 -08:00
Screemonster
2cd47f9c80
squashed commits - ion pistol refactor and away mission emp nerf
2018-02-11 09:27:40 +00:00
Leshana
1d0f5262d8
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
...
# Conflicts:
# code/__defines/subsystems.dm
# code/controllers/master_controller.dm
# code/controllers/subsystems/atoms.dm
# code/game/machinery/Sleeper.dm
# code/game/machinery/doors/airlock.dm
# code/game/machinery/vr_console.dm
# code/game/objects/items/devices/communicator/phone.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/modules/admin/admin_verbs.dm
# code/modules/mob/living/carbon/carbon.dm
# code/modules/multiz/movement.dm
# code/modules/projectiles/gun.dm
# code/modules/shuttles/shuttle.dm
# code/modules/shuttles/shuttles_web.dm
# icons/obj/doors/doormed.dmi
# maps/southern_cross/items/headset_sc.dm
# maps/southern_cross/southern_cross-3.dmm
# vorestation.dme
2018-02-07 19:30:50 -05:00
Andromeda-K22 and Anewbe
58cf8000ba
Automatic firemode for guns ( #4730 )
...
* New gun firemode: automatic
Full-auto destruction at the tip of your fingers! If you're an admin. Switch the automatic var to 1 to make any gun automatic.
This code is largely donated by Mport and the SS:CM project. Relevant modifcations are located in automatic.dm, special.dm, and automagical.dm
* Removes '/blue's
* Removes a block of pseudocode.
* Welp. Missed some things.
* Automatic removed from the Suppression gun, as requested by @Anewbe in #4730
* Requested changes.
2018-02-06 22:57:53 -06:00
Anewbe
52398aa0cf
Adds Phase Pistols
2018-02-05 17:53:12 -06:00
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
killer653
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
Anewbe and GitHub
c0615e47cf
Merge pull request #4437 from Belsima/whatifgammer
...
more grammer
2017-12-12 19:31:06 -06:00
Belsima and GitHub
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
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
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
killer653
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -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
Cyantime and GitHub
96190e94aa
Allows emitters to blast through rocks again.
2017-09-29 01:05:40 -04:00
Neerti
afd7b15442
Adds the Lost Drone
2017-09-22 01:17:53 -04:00
killer653
bddfa16f82
Polaris sync
2017-09-15 21:17:34 -04:00
Anewbe and GitHub
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
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
killer653
cafac8efae
Polaris Sync
2017-08-28 20:52:11 -04:00
Spades
e7a4fbcba0
Fixes energy sniper back sprites not appearing
2017-08-10 06:45:24 -04:00
Spades
6b02206adf
Sniper Changes and Fixes
...
- Fixes the heavy sniper hand sprite so it no longer looks like a
pistol. Not ideal, but better.
- Changes energy sniper to use the Z8's hand sprite, because it's more
distinct than looking the same as the laser carbine.
- Adds the SVD back by request of Woodrat. It's not spawnable yet, since
I don't know where you want to balance it.
2017-08-09 21:04:58 -04:00
killer653
468e73c7f3
Polaris sync
2017-08-06 19:07:17 -04:00
Anewbe
71ea1b2b3a
Adjusts egun stun amount
2017-07-23 17:36:58 -05:00
Leshana
5ae26332fa
Merge branch 'master' into aro-tether-wip
...
# Conflicts:
# code/ZAS/_docs.dm
# code/game/area/areas.dm
# code/game/objects/explosion.dm
# code/modules/holodeck/HolodeckControl.dm
# code/modules/mob/living/say.dm
2017-05-16 00:26:32 -04:00
Arokha Sieyes
7058806865
Ports 'head' guns from Eris, change Hunter sprite
...
RD: Bluespace Harpoon
HoS: Lamia handgun
HoP: Holdout E-Gun
A few other unused ones included in code.
2017-05-09 02:42:32 -04:00
Leshana
88f0e65cf9
Converts our own uses of PoolOrNew to use just new()
2017-05-08 21:24:47 -04:00
Leshana
4fbfa7ee37
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
...
# Conflicts:
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/mob_defines.dm
# html/changelogs/.all_changelog.yml
# vorestation.dme
2017-05-08 21:07:45 -04:00
Datraen and Yoshax
3d442044d1
Adds Gene Targetting mode to Floral Somatoray
...
While I was rooting around in hydroponics code, I saw that a list was being regenerated with UI interaction, so I threw the list into the plant controller.
No proper sprites for the Floral Somatoray's new mode yet, but it uses the gun sprite from mutate mode, and the projectile sprite from yield mode.
2017-05-03 13:33:58 +01:00
Anewbe
3205631de3
Fixes an issue with the practice laser carbine
2017-04-30 10:26:05 -05:00
