Kelshark
33d109b2dd
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
2017-11-25 11:35:10 -05: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
Kelshark
92980edc93
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/jobs/job/science.dm
# code/modules/mob/living/carbon/human/species/station/human_subspecies.dm
# code/modules/mob/living/carbon/human/species/station/seromi.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# config/custom_items.txt
2017-10-29 18:14:56 -04:00
killer653
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
Anewbe
4eb5e9b6d0
Can't aim at invisible things
2017-10-23 12:11:11 -05:00
Anewbe
7a36a8cfb6
Merge pull request #4118 from mistyLuminescence/cryostorage
...
Reworks cryopod storage
2017-10-22 19:03:07 -05:00
Mechoid
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
mistyLuminescence
ae308a3a91
Reworks cryopod storage
2017-10-20 19:14:45 +01: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
Kelshark
3ab70b7996
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/objects/items/weapons/tools.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# config/custom_items.txt
# vorestation.dme
2017-10-17 08:49:37 -04:00
killer653
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
Anewbe
b14766ff92
Merge pull request #4078 from Mechoid/Projectile_Turretfunctions
...
Turret Targetting Update
2017-10-16 14:03:05 -05:00
Mechoid
9a04744ab6
Turrets detect targets through metal foam.
2017-10-15 13:48:38 -07:00
Mechoid
aac1ab0bb7
Dead bodies are no longer perfect shields.
2017-10-14 21:41:15 -07: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
Mechoid
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
Neerti
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
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
Kelshark
9e4136784d
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
# config/jobwhitelist.txt
# icons/mob/species/akula/mask_vr.dmi
# icons/mob/species/fennec/mask_vr.dmi
# icons/mob/species/fox/mask_vr.dmi
# icons/mob/species/nevrean/mask_vr.dmi
# icons/mob/species/vulpkanin/mask.dmi
# icons/mob/vore/taurs_vr.dmi
2017-10-03 19:04:51 -04: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
Neerti
64f02f70b2
Simple Animal Tweaks
...
Makes hivebots a bit smarter, shifts stats around, adds a few new sprites thanks to Mechoid, and adds a few new types.
Adds verbs that can be used as a player hivebot, to get them to follow you.
Spider eyes can now be seen clearly in the darkness, which looks spooky.
2017-09-24 23:43:14 -04:00
Kelshark
457ff1356a
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/reagents/reagent_containers/food/snacks.dm
# code/modules/vore/resizing/resize_vr.dm
# config/custom_items.txt
2017-09-23 11:40:55 -04: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
Kelshark
c91dbd0057
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
2017-09-21 18:37:11 -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
bf11fd569f
Fixes the beanbag clip sprites
2017-09-12 22:02:03 -05: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
Mechoid
98af877b21
Xenomorph Tweaks/Buffs.
2017-09-06 13:37:43 -07:00
Neerti
5c8140ee0b
Removes some world << output, fixes a few bugs.
2017-09-05 22:52:46 -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
Kelshark
5ee893eda1
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/language/station_vr.dm
# code/modules/mob/living/silicon/robot/robot_modules_vr.dm
# config/custom_items.txt
# maps/tether/tether-03-station.dmm
# vorestation.dme
2017-09-03 12:49:08 -04:00
Spades
bf771d3d0d
Grammar error
2017-09-01 04:46:44 -04:00
