Commit Graph

2504 Commits

Author SHA1 Message Date
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
849ef9a8d6 Merge pull request #4925 from VOREStation/vplk-tesla-grounding
Tweak Tesla Grounding Rods
2018-02-23 13:16:46 -06:00
atermonera
27c40c37cc Changelog update: 2/22/12018 2018-02-22 20:19:40 -08:00
Atermonera
4e9a1a0fba Unobfuscates GPS locations (#4910)
* Makes GPS units more useful, adds helper to give more useful dir strings

* Re-obfuscates PoI gps locations

They keep adir direction though, so finding them should generally be easier

* Re-obfuscates PoI gps locations
2018-02-22 22:10:18 -06:00
Atermonera
7f12366cc8 Merge pull request #4862 from Anewbe/steals_more_armor
Adds/steals more armor code, inventory changes
2018-02-22 18:55:01 -08:00
Atermonera
410aca398e Adds halogen counter tool, adds gas scanner to analyzers (#4903)
* Adds halogen counter tool, adds gas scanner to analyzers

* Appeases travis

* Missed a tag
2018-02-22 15:01:25 -06:00
Leshana
364c0253dc Tweak Tesla Grounding Rods
Grounding rods that are anchored can be struck two turfs farther away than unanchored.  This makes it possible to leapfrog towards a tesla because an unanchored one can be protected in the "shadow" of the anchored one.
2018-02-22 15:32:31 -05:00
Anewbe
e5dd88cd30 Fixes Changelog 2018-02-22 00:03:54 -06:00
Anewbe
8c5dc66a13 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor 2018-02-21 23:33:17 -06:00
Anewbe
01ae959020 Merge pull request #4865 from Atermonera/umbrella
Adds umbrellas
2018-02-21 23:06:44 -06:00
BillyBangles
5486edf567 Adds various cabin-related things. (#4888)
* adds fireplace, makes bonfire generate heat

kinda, anyways

* adds sifwood tiles, fixes old blue carpets

old blue carpets are now known as "teal carpets." they still come in the
carpet crate from cargo.

* lets you dig up tree stumps with shovels

* changelogs in the house

* adds a delay to digging up stumps

digging up stumps is easier said than done
2018-02-21 15:45:01 -06:00
atermonera
64f09b0070 Changelog update 2018-02-21 00:39:51 -08:00
Leshana
5817e3da7b Makes electrochromatic glass buildable and programmable in game. (#4883)
- Reinforced glass windows can be upgraded to electrochromatic by hitting them with a cable coil.  The window must not be unpried from its frame to upgrade it (but it can remain anchored).
- Windows can be linked with a tint button by using a multitool on the button to buffer it, then using it on the window to set the ID.  The window must be completely unanchored to edit its id.
- Window tint buttons can have thier ID set *once* with a multtool.
- Inspired by Baystation12/Baystation12#20508
- Also adds a "full tile" polarized window type for use by mappers.
2018-02-21 00:33:49 -08:00
Anewbe
07c970e6e5 Merge pull request #4894 from Woodratt/02202018_vaultpoi
New Cave PoIs
2018-02-21 02:02:28 -06:00
Anewbe
67261d40f3 Adds planetside gun permits (#4879) 2018-02-20 12:37:03 -08:00
Anewbe
25a1f47a30 Headset sprites, planetside headset functionality (#4869) 2018-02-20 12:36:22 -08:00
Woodratt
dad162659a New Cave PoIs
- Addition of 6 new potential PoIs for the cave z-level.
2018-02-20 00:59:30 -08:00
Mechoid
39e737f2a3 Merge pull request #4846 from Anewbe/wetslime.nt
Prometheans are bothered by water
2018-02-19 20:28:26 -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
atermonera
4197a0c117 Adds umbrellas sprites courtesy of schnayy 2018-02-17 13:30:50 -08:00
Anewbe
84fdf3369f Changelog 2018-02-17 15:26:11 -06:00
Anewbe
077b73a446 Suit coolers don't magically shut off in mild fires (#4820) 2018-02-17 11:19:21 -08:00
atermonera
60559da6ab Changelog update 2018-02-17 10:57:52 -08: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
ab9f296adb Merge pull request #4837 from Schnayy/giftitems
Gift items + Cargo crate
2018-02-16 12:52:59 -06:00
Anewbe
b7711fa490 Prometheans are bothered by water 2018-02-15 19:11:54 -06:00
PrismaticGynoid
3e8109e8c6 Department ponchos for all
Removes the job restrictions on the department ponchos, making them able to be taken from the loadout by any job, just like the department jackets.
2018-02-15 16:26:55 -08:00
BillyBangles
f5dfbff1bd Build igloos and snowmen (#4811)
* adds packed snow brick material

* makes snow walls spawnable for mapping

* adds snowmen

craft them with snow. duh.

* snow spider triggers arachnophobia

also changelog.
2018-02-15 14:25:51 -06:00
Anewbe
7e2df51283 Changes mine code, adds random mine spawners (#4817) 2018-02-15 12:19:58 -08:00
Schnayy
02447e5c19 The largest PR I've probably actually done. Adds the following:
* Bouquets
* Fake Bouquets. Can be won from arcade machines.
* Heart box chocolates containing a set arrangement of chocolates.
* Adds said chocolates (milk chocolate, white chocolate, and truffles) all bite-sized.
* Adds 5 cards, one blank and four with covers. Function identical to paper except you can't make an airplane because I hate fun.
* Adds The four cards with covers, 3 real bouquets, and 2 chocolate boxes to cargo under a 'gift crate' for 10 points.

Sprites by me. Code would not be possible without cerebul's help. Let me know if I've goofed on something, but I did test all of the items + ordering them from cargo.
2018-02-15 03:33:23 -06:00
Anewbe
51d425b1b8 THE MINI FIST-PUNCH UPDATE (#4804)
* VARIOUS FISTICUFFS RELATED CODE CHANGES
2018-02-12 23:17:35 -08:00
Mechoid
dcf7b73320 Merge pull request #4796 from Anewbe/charger_radiation
Cyborg charger lessens FBP radiation.
2018-02-12 20:22:53 -08:00
PrismaticGynoid
188856be10 Makes More Machines Movable (#4801)
* Makes More Machines Movable

Adds in the ability to wrench/unwrench a number of machines that previously could not be. Now you're able to move:
Laptop venders!
Seed extractors!
Biogenerators!
Drying racks!
Microwaves!
Cooking machines!
Gibbers!
Chemmasters/Condimasters!
Bioprinters!
Virology machines!
Washing machines!
Tested with no apparent problems.

* Knew I forgot something
2018-02-12 14:01:14 -06:00
atermonera
fe983f0323 Updates changelog 2018-02-10 23:35:43 -08:00
Anewbe
bd2a364cfb Cyborg charger lessens FBP radiation. 2018-02-11 01:21:23 -06:00
Anewbe
252b2ffa1c Merge pull request #4772 from Atermonera/obfus_gps
GPS coordinates and POI names are obfuscated
2018-02-10 17:51:48 -06:00
Anewbe
28e8f4c989 Merge pull request #4771 from Woodratt/02092018_clothingtweaks
Clothing adjustments and fix
2018-02-10 17:43:47 -06:00
Atermonera
05c62ba9eb Adds EMP mines (#4679)
* Revert "Update #3? 4?"

* Revert "Revert "Update #3? 4?""

* Adds the disabled mech tools.

* indentation

* Counter-update

* Refactors mine code. Adds emp mines.

* Hecking spaces

* It compiles this time. For real, I swear
2018-02-10 01:53:54 -06:00
mistyLuminescence
fa6ff94474 What's Yours Is Mined (#4556)
* Boom!

* Wires!
2018-02-09 18:56:46 -08:00
atermonera
fae9c63ccf GPS coordinates and POI names are obfuscated 2018-02-09 16:59:03 -08:00
Woodratt
060e1aed18 Clothing adjustments and fix
- Utility uniforms can now roll up sleeves
- SAR, Shaft Miner, Explorer can now select webbings in the loadout.
2018-02-09 15:21:15 -08:00
Anewbe
e58e97c449 Merge pull request #4758 from VOREStation/vplk-airlocks-cycle-to-ext
"Planetary" Exploration Airlock Controller
2018-02-09 16:48:43 -06:00
Mechoid
736134d10f Merge pull request #4707 from Cerebulon/virologyRetoothing
Gives Virology teeth again
2018-02-09 11:49:45 -08:00
Anewbe
f25da053a7 Merge pull request #4753 from Atermonera/ethyl_fix
Ethylredox removes alcohol
2018-02-08 14:36:12 -06:00
Anewbe
0d76a5a886 Merge pull request #4755 from Atermonera/changelog3
Changelog update 2/7/2018
2018-02-08 14:32:14 -06:00
Anewbe
ce92a992ca Merge pull request #4747 from Woodratt/02062018_MapfixesShuttleupgrde
Shuttle Upgrades and Map Fixes
2018-02-07 23:33:33 -06: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
Leshana
4c910f0f2e Port cycle_to_external_air mode for airlock controllers.
* Adds a flag to controllers that instructs the airlock program to always purge between IN/OUT and also to pump air to "outside" instead of tanks when purging to go OUT.
* Tweak the way the airlock fudges target pressures so it more reliably operates when trying to pump down to vacuum.
* Adds an exterior airlock sensor that reads the air pressure in *front* of it, so it can be mounted on a shuttle but measure air outside the shuttle.
2018-02-07 17:32:15 -05:00
Hubblenaut
9db9681663 Cycling Airlocks Tweak
When cycling into a direction the airlock has already reached the target
pressure for, doing so will only toggle the doors.
2018-02-07 17:31:56 -05:00
atermonera
fff68b2b9b Changelog update 2/7/2018 2018-02-07 13:26:36 -08:00