4b2c98f919
Updates changelog
2018-06-08 12:14:13 -07:00
3106baef73
Merge pull request #3833 from VOREStation/upstream-merge-5326
...
[MIRROR] Ion Rifle returned to original radius.
2018-06-04 17:28:07 -04:00
6e99a135e3
Ion Rifle returned to original radius. ( #5326 )
...
* Return ion rifles to their intended 3x3 rather than 5x5.
* Changelog
2018-06-04 16:13:45 -04:00
35e974e3a0
Ion Rifle returned to original radius. ( #5326 )
...
* Return ion rifles to their intended 3x3 rather than 5x5.
* Changelog
2018-06-04 15:13:10 -05:00
76c8e20e2a
Merge pull request #5301 from Anewbe/more_merc_mob_things
...
Adds armor to certain mobs, mercs have knives
2018-06-03 03:58:47 -04:00
493a497d25
Merge pull request #5301 from Anewbe/more_merc_mob_things
...
Adds armor to certain mobs, mercs have knives
2018-06-03 00:58:07 -07:00
2d89d63c09
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018
...
# Conflicts:
# code/game/objects/structures/crates_lockers/closets/l3closet.dm
# code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
# code/game/objects/structures/crates_lockers/closets/secure/medical.dm
# code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/game/objects/structures/crates_lockers/closets/utility_closets.dm
# maps/southern_cross/structures/closets/misc.dm
# maps/submaps/surface_submaps/wilderness/DoomP.dmm
# vorestation.dme
2018-05-27 19:26:12 -04:00
917c7b71a5
Box of Things for Events and the Future MK1 ( #5281 )
...
* Lots of Stuff for Events
* Adds changelog.
* Review & QOL
2018-05-25 16:26:31 -07:00
f4645449b4
Adds armor to certain mobs, mercs have knives
2018-05-25 15:36:55 -05:00
fbeb390d52
Merge pull request #5277 from Mechoid/SeedpocalypseTheFirst
...
Seed storages are hackable.
2018-05-25 14:03:46 -05:00
5957251397
Merge pull request #5280 from Anewbe/poi_tweaks
...
Merc PoI Tweaks
2018-05-25 10:56:40 -07:00
6b42df0685
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
...
# Conflicts:
# code/__defines/misc.dm
# code/controllers/master_controller.dm
# code/game/machinery/computer3/computers/card.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/stacks/medical.dm
# code/game/objects/structures/signs.dm
# code/modules/admin/admin_verbs.dm
# code/modules/client/client defines.dm
# code/modules/client/client procs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/events/radiation_storm.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/mob.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_dispenser.dm
# config/example/config.txt
# html/changelogs/.all_changelog.yml
# interface/skin.dmf
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-05-25 13:23:47 -04:00
f65c7defa5
Updates changelog
2018-05-24 13:27:37 -07:00
73450f337d
Merge pull request #5284 from Anewbe/item_zoom
...
Swapping hands cancels zoom
2018-05-24 13:19:36 -07:00
418af6376d
Merge pull request #5272 from Lorwp/SARloadout
...
Adds SAR to allowed_roles of certain loadout items
2018-05-23 23:38:33 -05:00
24e081d425
Merge pull request #5274 from Mechoid/BuffPrometheans_NotReally
...
Adjust Promethean limbs.
2018-05-22 12:07:10 -07:00
31d2af32e6
Merc PoI Changelog
2018-05-21 23:29:11 -05:00
0647b05cd3
Swapping hands cancels zoom
2018-05-21 23:17:46 -05:00
10372ec726
Laptops don't eat IDs
2018-05-20 18:26:15 -07:00
4a7ea5086a
Seed Vendors are hackable.
2018-05-18 20:57:55 -07:00
37a8410d38
Tweak Prometheans, Again.
2018-05-17 18:18:13 -07:00
d6403126d5
Adds SAR to allowed_roles of certain loadout items
2018-05-17 21:18:49 +10:00
eabfa03891
Laser pointers ( #5257 )
...
* Laser pointers
Adds laser pointers, ported from tg/oldaurora (but heavily modified). They can be found in the loadout, as well as made by science. Science can also upgrade them, which makes them occasionally useful for blinding people, too.
The bugfixes which make several of the features work properly will come in a separate commit.
* Three fixes
Cats now have resting sprites for all 4 directions, instead of just east. This was needed to make cats look like they're pouncing on the laser dot.
Cameras can now be EMPed more than once, and EMPs actually are able to disable them now. This was needed for the shining lasers into cameras feature.
Flash_eyes() now actually displays a flashing animation on your screen when you get flashed (except for silicons, who for some reason are excluded from this unless EMPed). This was needed for laser pointers to have a temporary "blinding" effect when shone into someone's eyes.
(removes errant debug message too, whoops)
* Nerf
Reduced chances of laser pointers doing anything useful on silicons.
Also, fixes a duplicated proc, oops.
* Requested changes
Minor changes as requested - 'cell' to 'diode', view() to viewers(), range() to viewers().
Stops buckled or dead cats from reacting to laser pointers. Zombie cats are fun, but no.
Also, does another small nerf to the effects on silicons.
2018-05-14 15:22:19 -07:00
59a852ae45
Merge pull request #3661 from VOREStation/aro-ssao-vs
...
Ports 'fake' SSAO from /tg/ as a preference
2018-05-13 23:33:02 -04:00
7b73336244
Merge pull request #5261 from VOREStation/aro-ssao
...
Ports 'fake' SSAO from /tg/ as a preference
2018-05-13 17:20:28 -04:00
33202c5c38
Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01
...
# Conflicts:
# code/modules/mob/living/simple_animal/animals/giant_spider.dm
# html/changelogs/.all_changelog.yml
2018-05-10 13:48:20 -04:00
f746821964
Ports 'fake' SSAO from /tg/ as a preference
...
Allows players to pick whether they want this visual feature or not. Basically adds drop-shadows to objects and stuff. It's off by default.
2018-05-09 14:51:07 -04:00
634527aa5b
Ports 'fake' SSAO from /tg/ as a preference
...
Allows players to pick whether they want this visual feature or not. Basically adds drop-shadows to objects and stuff. It's off by default.
2018-05-09 14:49:00 -04:00
96a96c6855
Changelog for client FPS setting
2018-05-08 11:16:22 -04:00
2dda310687
Merge pull request #5182 from Anewbe/meteor_nerf
...
Meteor events have fewer waves with less dangerous meteors
2018-05-01 20:46:02 -07:00
e30dde9feb
Updates changelog
2018-05-01 13:25:16 -07:00
1db4c4b677
~Promethean Tweaks: The one with the chemicals, and the other thing. ( #5201 )
...
* Promethean Tweaks Round Howevermany We're On Now
* Tweak again. Drinks only plink damage that can be regenned. Multiple drinks, or other sources of tox will still mean these are dangerous.
* Add Blurb other than just "What has science done?"
* Adds the changelog.
* Fixes the stupid.
* Fixfix @ Ater
2018-05-01 12:23:47 -07:00
2ba4a6d332
Merge pull request #5228 from PrismaticGynoid/hardsuitsforsquishyskrell
...
Skrell hardsuit helmet sprites
2018-05-01 10:26:57 -05:00
3b3599dd0f
Skrell hardsuit helmet sprites
...
Adds a number of new sprites to the skrell versions of hardsuit helmets, most of which were using the human sprites. Some of these were ported from Aurora, and some were edited to fit skrell heads better. No longer will skrell be forced to squish their headtails into uncomfortable human-shaped hardsuit helmets.
2018-04-29 12:45:46 -07:00
ea96783d76
Updates changelog
2018-04-28 23:20:40 -07:00
9e4a625f18
Hides jobs with the Never pref on late join
2018-04-25 20:28:42 -05:00
6c686e6a2f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
...
# Conflicts:
# README.md
# code/game/jobs/job/job.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/carbon/human/npcs.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/Academy.dmm
# maps/RandomZLevels/beach.dmm
# maps/RandomZLevels/blackmarketpackers.dmm
# maps/RandomZLevels/challenge.dmm
# maps/RandomZLevels/example.dmm
# maps/RandomZLevels/jungle.dmm
# maps/RandomZLevels/listeningpost.dmm
# maps/RandomZLevels/spacebattle.dmm
# maps/RandomZLevels/stationCollision.dmm
# maps/RandomZLevels/wildwest.dmm
# maps/RandomZLevels/zresearchlabs.dmm
# maps/northern_star/polaris-1.dmm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# maps/southern_cross/southern_cross-7.dmm
# maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
# maps/submaps/surface_submaps/plains/Boathouse.dmm
# maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
# maps/submaps/surface_submaps/wilderness/Boombase.dmm
# maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
# maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
# maps/submaps/surface_submaps/wilderness/Drugden.dmm
# maps/submaps/surface_submaps/wilderness/Rockybase.dmm
# maps/submaps/surface_submaps/wilderness/Shack1.dmm
# maps/virgo/virgo-6.dmm
# vorestation.dme
2018-04-25 17:23:33 -04:00
a849010ab1
Makes organ removal/attachment right again ( #5192 )
...
* Makes organ removal/attachment right again
* Limb reattach - Changeo Loggo
2018-04-25 12:03:10 -07:00
45284a6669
Merge pull request #5203 from Cerebulon/greenpumps
...
Fixes pumpkins and watermelon sprites
2018-04-25 12:01:42 -07:00
1fc11fe8c5
Merge pull request #5187 from Anewbe/comms_tweak
...
Communicator visibility is now on a per-character basis, rather than global
2018-04-23 18:59:00 -07:00
5cfb443cce
Communicator visibility is now on a per-character basis, rather than global
2018-04-21 17:08:39 -05:00
818ff82c4d
Fixes pumpkins and watermelon sprites
2018-04-21 06:08:20 +01:00
b56299cc57
- Fixes carp plushies to now have a base sprite & be selectable in the loadout.
...
- Adjusts gift vendor to have a few of the newer plushies, as well as change them to cost thaler rather than a coin.
- Champagne is now a premium item rather than contraband.
2018-04-20 09:55:09 -05:00
aecd924ef2
Merge pull request #5161 from Atermonera/refactor_human_examine
...
Refactors human/examine.dm
2018-04-19 18:39:00 -05:00
fe0096c230
Updates changelog
2018-04-19 11:34:26 -07:00
afa615983a
Meteor events have fewer waves with less dangerous meteors
2018-04-18 01:13:40 -05:00
8cafd92f27
Removes AOOC from non-team antags
2018-04-14 23:25:34 -05:00
309fc23394
Refactors human/examine.dm
2018-04-09 20:08:38 -07:00
e08cbef044
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04
...
# Conflicts:
# code/modules/economy/lorenews.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
2018-04-06 15:40:06 -04:00
cdf794950e
Merge pull request #5135 from Woodratt/03302018_bugfixesandadjustments
...
Map fixes and tweaks
2018-04-02 23:52:20 -07:00
atermonera