Commit Graph
5249 Commits
Author SHA1 Message Date
Reddeyfish 635013f331 Merge branch 'virgoMaster' into virgoPull 2018-06-10 12:33:29 -07:00
Unknown 8e60db63f9 Voidsuit loadout fixes
- Removes duplicate helmets in EVA Bay
- Removes duplicate magboots/masks in Atmos
- Adds breath masks to EMT Voidsuits in EMT Bay
2018-06-01 10:29:21 -04:00
NovacatandAronai Sieyes 5addac95ed Pathfinder Update (#3777)
* Pathfinder Update

- Implimented Pathfinder, Command Exploration role
- Added Deluxe Machete for Pathfinders (just a cosmetic reskin)
- Added Pathfinder's office, between expedition prep and breifing
- Expanded size of expedition shuttle
- Ported Pilot and Explorer voidsuit from Baystation
- Restored the old air tank on the expedition shuttle
- Added a couple starter shelter capsules to exploration
- The expedition shuttle now has toggled blast doors to cover the windows
- Increases pay of pilots, SARs, and Explorers
- Adds box of volunteer headsets to the Pathfinder's locker

* Polaris Merge Compatability

* Forgot some things

* Moves PF from command to science

* Requested changes Part 1

* Travis and Access Fix

* Requested changes Part 2

* Resetting Maps Part 1

* Resetting Maps Part 2

* Replaces PF office airlock

* Requested Changes Part 3

* Remove gateway access

* Changes Locker/Door Access Req

* Removes blast doors

* Pilot voidsuit crate cost tweak
2018-05-31 16:57:40 -04:00
Aronai SieyesandGitHub c89e335031 Merge pull request #3797 from Very-Soft/engi-door-change
Changes one engi door to a maint door
2018-05-31 13:12:25 -04:00
Very-Soft 0cae77d18d Changes one engi door to a maint door 2018-05-30 02:29:24 -04:00
Arokha Sieyes 4ff48da96a SYNC: Map changes for lighting 2018-05-30 00:56:12 -04:00
Arokha Sieyes 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
AtermoneraandGitHub e1fe4d5a5d Merge pull request #5293 from VOREStation/pol-closets
Makes closets/crates like boxes
2018-05-26 15:24:45 -07:00
AtermoneraandGitHub 5957251397 Merge pull request #5280 from Anewbe/poi_tweaks
Merc PoI Tweaks
2018-05-25 10:56:40 -07:00
Arokha Sieyes 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
Aronai SieyesandGitHub 1cf83c39b7 Merge pull request #3753 from Mewchild/MC-3749-3743
Minor mining and Research Tweaks
2018-05-24 17:32:59 -04:00
Arokha Sieyes f9b409549e Makes closets/crates like boxes
Gives them a 'starts_with' (well, renames the existing one. Someone ported it but never actually applied it anywhere).
2018-05-24 17:26:17 -04:00
Mewchild 0af46e6c8c Fixes Bar Disposals 2018-05-24 12:54:39 -05:00
Mewchild 3df5f22827 Minor mining and Research Tweaks 2018-05-24 12:36:15 -05:00
Aronai SieyesandGitHub 03e709d92f Merge pull request #3739 from Novacat/MiscTweaks
New Explorer Gear
2018-05-24 09:18:51 -04:00
Aronai SieyesandGitHub 09fe3825ba Merge pull request #3729 from VOREStation/aro-issue-3724
Remove some missed spare helmets
2018-05-24 09:17:56 -04:00
Arokha Sieyes 80ffd86b0e Change accessories to use bitflags
Allows accessories to 'block' multiple slots
2018-05-22 15:55:22 -04:00
Unknown ca131caa10 New Explorer Gear
- Adds a new defensive exploration weapon intended for use by rear-line explorers, such as SARs and Pilots
- Ported Machete Sheath from Baystation, intended to be used with the machetes here
NOTE: I intended them to not be usable alongside holsters, but I am not sure how to go about this
- Explorer lockers will now come with a survival knife, machete, and machete sheath
2018-05-22 11:27:48 -04:00
Anewbe 868570414b Swaps out several PoI mobs and turrets 2018-05-20 18:47:27 -05:00
Arokha Sieyes c8b2783ae0 Update Tesla engine map 2018-05-19 20:36:51 -04:00
Reddeyfish 813d7bf643 Merge branch 'virgoMaster' into virgoPull 2018-05-19 17:16:17 -07:00
Mewchild 6e1096a53a Cargo Fixes 2018-05-19 14:46:39 -05:00
Mewchild 5c3cc84d27 Cargo Fixes 2018-05-19 14:34:33 -05:00
Arokha Sieyes 51b591f095 Replace explorer suit with basically the same suit
Except this one is wearable by all species, because there's no suit cycler that would work for the 'generic voidsuit'.
2018-05-18 14:14:19 -04:00
Aronai SieyesandGitHub 74338280ee Merge pull request #3691 from VOREStation/aro-shelterquol
Capsule shelter QOL
2018-05-16 18:40:07 -04:00
ThoughtSynapsis feec485159 Add's a few new POI's and minor fixes to old ones! 2018-05-16 12:53:03 -04:00
Arokha Sieyes e0a7ca54de Luxury shelter borg recharger 2018-05-14 22:48:11 -04:00
Arokha Sieyes 46f6121624 Capsule shelter QOL
Bolts/opacity button, roofs for multiz areas
2018-05-14 22:31:09 -04:00
drexampleandAtermonera 5d73584fa3 Adds the Statue - A hostile mob, that moves only when you don't see it (#5108)
* Statue

* Statue done!

* Testing map removed

* Grammar fix + ignoring creator

* Fixed typos, change range to oview, thanks to Atermonera

* made changes that I missed

* Nightvision handling

* diverse blind messages + requested changes

* Bugfixes, added isSynthetic to bots

* commentaries + PoI

* Finalized POI and statue

* removed misclick
2018-05-14 15:21:04 -07:00
BearandGitHub d2acefe0c5 Spelling Fix 2018-05-11 12:57:12 -04:00
Aronai SieyesandGitHub 7ad1a817de Merge pull request #3660 from Mewchild/MC-damnit_ace
Map changes for explorers
2018-05-10 15:47:39 -04:00
Arokha Sieyes c4f9017c76 Rename snake to giant snake
To prevent mistakes like this in the future!
2018-05-10 14:26:18 -04:00
Mewchild c8db04f8bf Shut up travis 2018-05-09 12:18:05 -05:00
Mewchild 6f4f352b0d Map changes for explorers 2018-05-09 11:36:26 -05:00
Aronai SieyesandGitHub ffa8459c44 Merge pull request #3644 from VOREStation/aro-issue-3642
Make underdark not a 'station' level
2018-05-08 19:46:13 -04:00
Aronai SieyesandGitHub 86e413bf00 Merge pull request #3634 from VOREStation/aro-taur_suits_must_die
Removes taur suits
2018-05-08 19:09:29 -04:00
Aronai SieyesandGitHub 96d2aa0c1d Merge pull request #3646 from VOREStation/aro-issue-3636
Adjacency check for tram departures
2018-05-07 16:54:19 -04:00
Mewchild e1b8eede1a Moves APC in mining airlock 2018-05-06 09:18:37 -05:00
Arokha Sieyes f406a4597a Adjacency check for tram departures
Fixes #3636
2018-05-06 01:31:13 -04:00
Arokha Sieyes 4282de5828 Make underdark not a 'station' level
Fixes #3642 and hopefully doesn't break anything else
2018-05-06 01:23:32 -04:00
Arokha Sieyes 4ce3f055b5 Fix underdark mob spawn areas again again again 2018-05-04 22:18:03 -04:00
Arokha Sieyes c4cbe31199 Removes taur suits 2018-05-04 22:16:17 -04:00
Aronai SieyesandGitHub 90a90e7c74 Merge pull request #3622 from Very-Soft/lets-add-more-maints
Adds more maintenance to z6 and z7
2018-05-04 18:56:54 -04:00
Arokha Sieyes 0fdffe71a3 Fix an active edge on z7 2018-05-03 19:32:14 -04:00
Lorwp 71811ef9e9 Corrects missing manifold and pipe in Distro 2018-05-02 21:24:32 +10:00
Very-Soft 35a9250328 Removes some tags 2018-05-01 00:03:29 -04:00
Very-Soft 01060577b0 Adds more maints to z6 and z7 2018-04-30 22:19:56 -04:00
Aronai SieyesandGitHub 33efa72b95 Merge pull request #3613 from VOREStation/aro-issue-3572
Tweaks mining shed, adds UD relay
2018-04-30 19:47:41 -04:00
Arokha Sieyes a76d8a7fcb Mining underdark and telecomms tweaks 2018-04-30 19:37:17 -04:00
Aronai SieyesandGitHub fe5c89b84c Merge pull request #3608 from VOREStation/aro-issue-3607
Update cryo objects at CC to use tram spawn
2018-04-30 19:36:58 -04:00