Commit Graph

7131 Commits

Author SHA1 Message Date
Kelshark
c048a8ea8b Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/vore/weight/fitness_machines_vr.dm
#	config/custom_items.txt
2018-02-02 19:25:51 -05:00
RadiantFlash7
22d13f10c2 All my changes so far.
note to self: Engineering, Perma, civil jobs, and electricity+piping
2018-02-02 04:57:01 -05:00
Leshana
4f98fad36b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
# Conflicts:
#	.travis.yml
#	code/_away_mission_tests.dm
#	code/modules/admin/verbs/mapping.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z10.png
#	nano/images/nanomap_z2.png
#	nano/images/nanomap_z3.png
#	nano/images/nanomap_z5.png
#	nano/images/nanomap_z6.png
2018-02-01 23:55:47 -05:00
Neerti
504593a01e Merge pull request #4696 from Woodratt/01312018_guncabhotfix
Gun Cabinet hotfix
2018-02-01 02:51:02 -05:00
Woodratt
f68cf380ae Gun Cabinet hotfix
- Should fix explorers not being able to get into their gun cabinets
2018-01-31 23:13:30 -08:00
Neerti
24569fb95d Merge pull request #4690 from Woodratt/01312018_SC_Stationmapfixes
Further Map Fixes and Adjustments
2018-02-01 01:20:06 -05:00
Leshana
612a75cb49 Prevent communicators from connecting to the exonet when off station. 2018-01-31 21:02:22 -05:00
Neerti
c18ce47bff Merge pull request #4683 from Woodratt/01302018_SC_POIMAP
Southern Cross POI adjustment and Map adjustments
2018-01-31 15:42:48 -05:00
Woodratt
ed29353021 Further Map Fixes and Adjustments
- Deck 3 Port Airlock fixed
- Vent added to cargo delivery office to fix over pressure
- Windoor in Robotics given proper access and named
- Parachute crate added to pilot areas
- Access around cargo made more consistent
- Fixed first deck starboard hallway area
- Pilots now have access to maintenance around the hangars
- More ATMs added
- Center door on bridge removed
- Open sign from Bar borrowed for cafeteria as well
- Critical addition, Dog bed in HoP office
- Fixed T-comms turrets yet again
- Adjustments to engine room allowing for a second set of TEGs to properly be set up (Thanks to Kerbal/Mazian). Also moved vent control to a different position to stop a certain headmin from repeatedly hitting it
2018-01-31 05:11:23 -08:00
Arokha Sieyes
17723b7df6 Cleans up references to assistant
Defines the USELESS_JOB value as "Visitor"
2018-01-31 00:55:13 -05:00
Aronai Sieyes
6c2840ef9e Merge pull request #2895 from Verkister/doofle
Adds dufflebags and saddlebags to utility loadout.
2018-01-30 17:41:41 -05:00
Aronai Sieyes
03319e4597 Merge pull request #2811 from Verkister/otiepoop
Otie fixes and tweaks plus another new variant.
2018-01-30 16:21:55 -05:00
Neerti
aacf3998c1 Merge pull request #4677 from MarinaGryphon/parachutes-fix
Fixes a bug with packing parachutes.
2018-01-30 09:48:50 -05:00
Woodratt
28dfb0b4b0 Southern Cross POI adjustment and Map adjustments
- DJ Station APC turned off at default
- DJ Station one general intercom replaced with a syndicate intercom
- DJ Station headset no longer guaranteed to spawn, one in four chance to spawn in one of the rooms
- DJ Station Exterior tiles (around the generator) marked as outdoor tiles
- Advanced roller beds moved to SAR lockers
- Blood cabinet and IV stand in SAR room, two o- blood bags and two empty blood bags at round start
- Mining outpost now locked to IDs with maintenance access and research access
- Observation windows in xenobio are now electrified
- Extra sinks and a high capacity water tank added to xenobio
- Red flags in the caves to designate the 'border' between the regular caves and the more dangerous ones
- Xenoresearch first aid station door name fixed
2018-01-30 03:50:55 -08:00
Verkister
85e5731713 Adds dufflebags to loadout.
-Adds dufflebags to loadout, including normal, black(cosmetic), and department specific versions with appropriate access restrictions to utility category.
-Adds a cosmetic black duffle without the syndie speed buff.
-Moves taur saddlebags from accessories category to utility category.

Just a little preference QoL thing when you don't feel like scavenging and littering the station with discarded starter bags.
2018-01-30 13:14:39 +02:00
KotetsuRedwood
8106f27e96 Adds latex maid dresses to trash piles and loadout uniforms!
squrrrllk and other similar noises
2018-01-30 08:44:24 +00:00
Neerti
6226d3d15c POI Tweaks (#4645)
* WOrk

* Changes more PoI stuff.
2018-01-29 23:42:57 -06:00
Marina Gryphon
bb4ff8a507 Fixes a bug with packing parachutes. 2018-01-29 22:44:53 -06:00
Verkister
3a4d470604 disables pc grab growl while travis sucks legs over unrelated map bugs
some minor sprite tweaks

environmental disaster time

more things

bumps front and back rest sprites one p down

Some otie tweaks plus another new variant.
-Stops idle actions on player-controlled oties.
-Disables feeding autobarf (secdonut and rng) on player-controlled oties.
-Disables friending and auto standup on petting when player-controlled.
-Adds a tamed phoron otie with collar. (no ingame access yet so beg for mins)
-Tweaks the bare standing sprites a little. (one pixel shorter with even back stripes)
2018-01-29 09:02:48 +02:00
Mechoid
e9886625fa Adds Material Girders (#4622) 2018-01-28 18:13:54 -08:00
Aronai Sieyes
e69af92218 Move these defines into proper files (#4653) 2018-01-28 18:09:35 -08:00
Aronai Sieyes
6c1ab66d44 POLARIS: Allow pulling objects through step teleports. (#4635) 2018-01-28 01:10:20 -08:00
Cerebulon
ebc855e1fb Added Decoupled starship engine PoI (#4649) 2018-01-28 01:08:40 -08:00
Leshana
27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	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/southern_cross/southern_cross_jobs.dm
#	vorestation.dme
2018-01-27 23:08:53 -05:00
Aronai Sieyes
88cab44124 Merge pull request #2848 from VOREStation/aro-exploration
Exploration Update
2018-01-27 15:32:42 -05:00
Arokha Sieyes
19b2d5a338 VS: Polaris already has this, I need it now though 2018-01-27 14:10:51 -05:00
Arokha Sieyes
1910940c43 VS: Remove some bad VS edits 2018-01-27 14:10:50 -05:00
Arokha Sieyes
8a147d5a3a POLARIS: Move these defines elsewhere 2018-01-26 17:17:40 -05:00
Arokha Sieyes
716a932f26 POLARIS: Allow pulling objects through step teleports. 2018-01-25 16:44:30 -05:00
Kelshark
85f9061592 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/controllers/autotransfer.dm
#	code/datums/supplypacks/contraband.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme
2018-01-24 19:52:12 -05:00
Neerti
891440376b Merge pull request #4624 from Anewbe/skyfall
Falling from the sky should work again
2018-01-24 19:17:31 -05:00
Anewbe
dca25babf6 Merge pull request #4623 from Woodratt/01232018_sc_top_gun
Southern Cross Pilot DLC Update
2018-01-24 17:05:07 -06:00
Anewbe
4706e8d0cc Falling from the sky should work again 2018-01-23 23:40:03 -06:00
Anewbe
dfa6de7a43 Merge pull request #4613 from Neerti/1/21/2018_there_is_no_ceiling
Adds Missing Ceiling Overlay + Fixes Space on Roof
2018-01-23 18:19:47 -06:00
Woodratt
f8394ca19a Southern Cross Pilot DLC Update
- Addition of two pilot uniforms x2 pilot helmets x2 pilot uniforms (+ webbing) x1 blue pilot jacket. Basic Teshari sprites included.
- Pilot uniforms done by ASN set as default pilot outfit. Other uniform will be in the loadout when we switch maps
- SAR get Explorer radio channel access
- More map fixes and additions. In theory skies of sif should no longer be vacuum. Oxygen required as super cold.
- Removal of Explorer pilot access due to the shuttles having autopilot now.
2018-01-23 15:42:57 -08:00
Anewbe
b13148a051 Merge pull request #4610 from VOREStation/vplk-breakerbox
Allow constructing breaker boxes in game
2018-01-23 12:05:48 -06:00
Neerti
3580b6c3e2 Merge pull request #4603 from Cerebulon/PascalBPoI
Irradiated Manhole Cover PoI
2018-01-23 01:34:34 -05:00
Neerti
d71a610a97 Adds Missing Ceiling Overlay + Fixes Space on Roof
On Multi-Z compatible maps, if a tile is missing a ceiling (IE there is an open space above it), it will display an overlay to show this. This makes it easier to know where the hole in the ceiling is without having to go to the ceiling. Overlay sprite by Mechoid.
Also fixes space tiles appearing when meteors/explosions/other fun things occur on the Southern Cross map instead of open space.
2018-01-22 14:27:19 -05:00
Arokha Sieyes
9016ca94c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018
# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.
2018-01-22 12:10:19 -05:00
Leshana
01925e9de2 Add circuit and research design to allow constructing breaker boxes in game. 2018-01-21 20:36:44 -05:00
Cerebulon
0561819bd3 capitalization of item 2018-01-22 00:30:53 +00:00
Cerebulon
cd80242b81 Cover emits low-level radiation 2018-01-21 06:53:15 +00:00
Anewbe
215bbb89e7 Merge pull request #4595 from Mechoid/Gas_Tank_Extension
Chainsaw tweaks. Take two.
2018-01-21 00:40:26 -06:00
Leshana
805897eafb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-20 2018-01-21 00:23:00 -05:00
Cerebulon
53e546c526 Radioactive Manhole 2018-01-21 04:42:21 +00:00
Anewbe
e5b424e9a8 Merge pull request #4588 from VOREStation/vplk-tesla-book
Added operating manual book for Tesla
2018-01-20 20:01:38 -06:00
Cyantime
84c3154b2b Merge branch 'master' into hypo 2018-01-20 01:39:16 -05:00
Mechoid
ebc03cceac Tweaks chainsaws. Again. 2018-01-19 21:11:48 -08:00
mistyLuminescence
a190ec5725 Allows modkits to be created for any item. (#4450)
* Adds modular modkits
* Adds explorer suit functionality to voidsuit modkits.
2018-01-19 18:11:28 -08:00
Leshana
3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19
# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2018-01-19 17:52:25 -05:00