Commit Graph

1500 Commits

Author SHA1 Message Date
Arokha Sieyes
a81e3fdb49 Adds holoplants, and to cargo
Courtesy of CEV Eris SS13 server (plus a bunch of additional code to make them real machines)
2018-02-20 22:17:50 -05: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
Leshana
ef3df27528 VOREStation Specific Merge Changes
* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.
2018-02-17 16:56:31 -05:00
Anewbe
7cc8fa0cba Gives Miners shinybits. (#4840)
* Gives miners marker beacons, moves their locker to another file

* Makes marker beacons ITEM_SIZE_SMALL
2018-02-17 11:19:48 -08:00
Anewbe
329a65be08 Merge pull request #4838 from VOREStation/pol-emerboxes
Port Bay's survival boxes
2018-02-17 10:05:39 -06: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
Arokha Sieyes
f4d0ec3fb8 Port Bay's survival boxes
Includes some tweaks to items that usually come in the boxes to make them more similar to the Bay implementation.
2018-02-16 19:21:15 -06:00
Anewbe
79b8c283f7 Merge pull request #4845 from Heroman3003/grill-typo
Fixed typo in unfastening grille
2018-02-16 12:50:18 -06:00
Heroman3003
bd6ef1b09f Fixed typo in unfastening grille
Grille, not grill
2018-02-16 11:38:12 +10: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
BillyBangles
ef86caf177 Adds decorative bones and bone loot pile (#4800)
* adds various bones and bone loot pile

credit to schnayy for most of these sprites

* removes the crossbow bolt from the loot list
2018-02-12 22:13:47 -06:00
Anewbe
6f2c47e5a9 Trees take damage from bullets/lasers (#4786) 2018-02-11 18:57:20 -08:00
Aronai Sieyes
526e886a21 Merge pull request #2994 from Verkister/badboi
Adds a fancy new voremob.
2018-02-10 23:04:47 -06:00
Anewbe
78042b8db6 Merge pull request #4760 from Neerti/2/8/2018_door_assembly_fix
Makes Projectiles Sometimes Pass Through Door Assemblies
2018-02-10 01:55:38 -06:00
Silver
8c36391925 Propernaming for VIRGO PR#3000
https://github.com/VOREStation/VOREStation/pull/3000
2018-02-08 17:45:12 -06:00
Mechoid
251297a2ba Promethean Balancing, Lore-compliant Modification of Security Equipment (#4722)
* Works on Balancing Prometheans

* Reorganize from Master Merge

* Tries to fix that gun conflict that the DMI merger apparently did fine?
2018-02-08 14:58:17 -06:00
Silver
13b710fb61 Silver-ContrabandUpdate
Adds AwooCrate and MlemCrate to Contraband Supplypack. (These show up under 'supplies' in a hacked cargo console and are quite expensive)
2018-02-08 13:01:51 -06:00
Neerti
a38e66305b Makes Projectiles Sometimes Pass Through Door Assemblies
What it says on the tin.
2018-02-08 04:37:21 -05:00
Verkister
d240032910 some changes 2018-02-08 10:57:45 +02:00
Verkister
7afc963393 Adds a fancy new voremob.
-"corrupt hound". Basically a messed up evil feral borgo.
-Currently only available without bus shenanigans through the dangerous pred crate. Could be added to some expeditions and such I guess.
-Loot drops illegal borg upgrade module.
2018-02-08 10:11:42 +02: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
Woodratt
7ee2b5266a Shuttle Upgrades and Map Fixes
- Upgrades the shuttles with enviroment sensors and the ability to see if the rear hatch is open.
- Gun cabinets station side in the hangar control rooms. Explorer, Pilot, Armory Access.
- Surgery room redesign, replaced closets with wall closets.
- Multiple other smaller map bug fixes.
2018-02-06 22:58:44 -08:00
Leshana
5847319443 Update every initialize() proc to return an initialize hint.
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-05 15:50:13 -05:00
MarinaGryphon
72318d46b6 Replaces most of the gender macros. (#4681)
* Fixes #4632.

* 1:27 am coding best coding

* fixes a warning

* Removes the last of the gender macros. Gender is dead.

* gender II: the travis-ing

* linebreaks are dead too.

* oops i accidentally the gender, also ambiguous gender is now taken into account for get_visible_gender
2018-02-03 14:40:09 -06:00
Leshana
38f20304ca Initialize procs for virgo 2018-02-03 01:00:57 -05:00
Leshana
cef001bf2a Update every initialize() proc to return an initialize hint.
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-03 01:00:57 -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
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
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
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
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
Cerebulon
ebc855e1fb Added Decoupled starship engine PoI (#4649) 2018-01-28 01:08:40 -08:00
Cyantime
84c3154b2b Merge branch 'master' into hypo 2018-01-20 01:39:16 -05: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
Woodratt
d1f8e875a8 Southern Cross Bugfixes and additions
- Multiple fixes for map errors, and removal of christmas decor
- Addition of a gym station side, deck one
- nav beacons and beepsky added
- overhaul of the centcomm z to look more like the Northern Star
2018-01-18 20:01:01 -08:00
Cyantime
09eb4054a5 Removes hypospray/vr and vial/vr 2018-01-18 19:01:26 -05:00
Arokha Sieyes
dc0e602663 Knife path fix for VS trashpiles and a fluff item 2018-01-18 15:48:14 -05:00
Belsima
a0d4549d2e Buffs the mop bucket by the same amount as the janicart. 2018-01-17 19:20:07 -05:00
Cameron653
788d5a68d6 Makes janicarts hold more water (#4558)
* Makes janicarts hold more water

So you don't have to run back to grab some more water every 20 seconds while cleaning up dirt.

* Update janicart.dm
2018-01-17 17:29:49 -06:00
Arokha Sieyes
ff228754b3 Merge polaris sync 01 17 2018
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Neerti
5b54f4c875 Surface Map Work (#4557)
* Tweaks Surface, POI system

* More Stuff

* Travis Appeasement

* Fixes invisible banner.
2018-01-17 13:46:19 -06:00
Arokha Sieyes
f2fef6f410 Planes Framework (#4545)
* Polaris initial plane upstream merge

* POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT

* POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.

* POLARIS: Adds a 'alter values' proc for plane master ease of tweaking

Setting stuff like colorblindness variety and things.

* Remove NIF reference, fix lighting layer define

* Handle effects above lighting plane

* Moved all layer defines to planes+layers.dm
* Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE

* Merge: 3000% human/update_icons() speed improvement

* Merge: Avoid ghosts pointing at things
2018-01-17 13:45:54 -06:00
Leshana
5d5f052eb7 Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10
# Conflicts:
#	code/game/machinery/atmoalter/area_atmos_computer.dm
2018-01-15 13:27:39 -05:00
Anewbe
c632c2604d Merge pull request #4533 from VOREStation/pol-mecha
Two interface QoL changes (closets and mechs)
2018-01-15 01:31:29 -06:00
Neerti
96d3d361d0 Adds Boats, Ports /TG/ Buckling (#4527)
* Adds Boats, Ports /TG/ Buckling

* Travis Appeasement

* Changelog
2018-01-14 14:58:15 -06:00