6ec3003bbf
Toolbelt can now hold the circuit debugger
...
Finally.
2018-05-28 23:40:51 +02:00
f67420d7b4
Actually whitelists HoP
...
I am a dumb.
2018-05-24 15:22:44 -07:00
813d7bf643
Merge branch 'virgoMaster' into virgoPull
2018-05-19 17:16:17 -07:00
622a0dd1fa
Merge pull request #3712 from VOREStation/aro-ssao-ex2
...
Fixes #3711
2018-05-18 22:14:20 -04:00
927050ce44
Fix various syntactic problems
2018-05-16 21:43:18 -07:00
ddfa11b80c
Fixes #3711
2018-05-16 21:59:39 -04:00
41a997d43e
Merge pull request #3687 from VOREStation/aro-ssao-ex
...
Exclude some things from SSAO
2018-05-16 18:44:39 -04:00
4018e14d12
Revert "Upgrades Planetary Weather to vis_contents ( #5170 )"
...
This reverts commit e3e1a7ad9c
2018-05-15 00:57:55 -04:00
0a5181e210
Merge pull request #3603 from kcin2001/micromechs
...
Adds Micro mechs
2018-05-14 20:00:57 -04:00
3d0e50e2a4
VS: The VS excludes for SSAO
2018-05-14 11:54:10 -04:00
bdfa34c911
SSAO object excludes
...
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:54:10 -04:00
ba6a2b5641
Merge pull request #3668 from VOREStation/polaris-sync-2018-05-01
...
Polaris Sync 2018-05-01
2018-05-13 23:20:18 -04:00
4706bf1801
Resolve shower curtain/steam layering issue
...
Reported in https://github.com/VOREStation/VOREStation/issues/3594 , curtains and steam layer under mobs due to the plane update. This fixes that, and causes them to layer correctly.
2018-05-12 15:29:17 -04:00
92edb296e0
minor naming fix
2018-05-12 11:51:39 -07:00
e6085f4aa1
Allow throwing items into smartfridges (sometimes)
...
Allows anyone to throw items at smartfridges, and have a small chance of it getting stored, UNLESS you're the 'expert job' for that smartfridge (e.g. Chemist for the Chemistry one), at which point there's a 98% chance because you and the machine have an understanding.
2018-05-11 14:10:28 -04:00
dccb204c56
Merge branch 'master' into micromechs
2018-05-10 15:49:03 -04:00
c4f9017c76
Rename snake to giant snake
...
To prevent mistakes like this in the future!
2018-05-10 14:26:18 -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
c0c9ab541f
Merge pull request #3630 from VOREStation/aro-cryograb
...
Fix alignment for grab insertion cryo placement
2018-05-08 19:51:45 -04:00
86e413bf00
Merge pull request #3634 from VOREStation/aro-taur_suits_must_die
...
Removes taur suits
2018-05-08 19:09:29 -04:00
ba5bfa00bb
Merge pull request #3583 from Verkister/chompychomp
...
Adds a funky fresh feature to beartraps.
2018-05-05 08:32:38 -04:00
9007b9e398
Merge pull request #3621 from VOREStation/aro-cryoitems
...
Redo cryo item storage
2018-05-05 08:28:55 -04:00
c4cbe31199
Removes taur suits
2018-05-04 22:16:17 -04:00
956fb7940a
Merge pull request #3617 from VOREStation/aro-dronesleep
...
Allow maint drones to 'cryo' using the robot pod things
2018-05-04 18:57:28 -04:00
354d3c1aff
Fix alignment for grab insertion cryo placement
2018-05-03 17:53:27 -04:00
7eaff9b3e0
Merge pull request #5222 from VOREStation/pol-freezer
...
Increase zealousness of Portable Freezer item whitelist
2018-05-01 10:18:34 -05:00
bdc7e504fb
Redo cryo item storage
...
Fixes #2682 , Fixes #2610
Cryo no longer stores any items, only logs for admin use and for player use who cryo'd with what 'important' items.
2018-04-30 20:30:58 -04:00
8dc694cfb6
Merge pull request #3612 from VOREStation/aro-issue-3582
...
Ensure the right species are in suit cyclers
2018-04-30 19:30:54 -04:00
40849de55f
Allow maint drones to 'cryo' using the robot pod things
...
Dunno why they were excluded. If it's a horrible issue I guess we'll find out why.
2018-04-30 17:49:47 -04:00
1183e943b1
Merge pull request #3579 from Very-Soft/underdark-bones
...
Adds warning signs to the entrance of the underdark
2018-04-30 15:07:04 -04:00
1f55a4539a
Ensure the right species are in suit cyclers
...
Fixes #3582
2018-04-30 14:57:05 -04:00
fea679888a
Adds Micro mechs
2018-04-29 16:07:32 -07:00
4828319605
Merge pull request #5212 from Woodratt/04252018_POIstage05
...
PoI Stage 0.5
2018-04-28 20:48:30 -07:00
26c46b3ed5
Merge pull request #5208 from Heroman3003/untilted
...
Fixed sprites tilting when standing up during crawling
2018-04-28 20:40:50 -07:00
e3e1a7ad9c
Upgrades Planetary Weather to vis_contents ( #5170 )
...
* Upgrades Planetary Weather to vis_contents
Makes the weather on Sif use vis_contents instead of overlays, which should fix all weather-related icon issues, and may or may not be faster.
Weather updates instantly now.
Fixes indoor PoIs having outdoor weather.
* Tries to appease Travis
2018-04-28 20:40:11 -07:00
5715e58691
Adds signs and bones to the underdark!
2018-04-28 23:31:05 -04:00
b06b1d16a8
Makes file pathing for mobs not complete autism
2018-04-28 13:37:41 -04:00
1c1ab01a69
Merge branch 'virgoMaster' into virgoPull
2018-04-28 10:12:34 -07:00
1d0aeb95bd
Increase zealousness of Portable Freezer item whitelist
2018-04-27 20:16:57 -04:00
f01a8fffe3
hurrgh
2018-04-28 00:28:15 +03:00
c32bcf785a
PoI Stage 0.5
...
Doing this in smaller bits
- New random sif mob selector, peaceful animals
- Drone lootpile (basic placeholder loot right now until we figure out how to give them proper drone loot)
- New random spider mob selector, nurse spider and nurse hat spider (hat spider has 10 more health points and is a rare chance to spawn, woo)
- New spacesuit random spawn, medical space suits
- New Random Shotgun spawn
- New random gun spawns
- Fixed icon for random medicine spawn
- Fixed broken icon for 44 magazines
- Fixed Ice Cave dungeon walls being called 'steel'
- Added new Crystal type, to avoid the SM style crystal from spawning in crystal PoIs
2018-04-25 22:11:30 -07:00
ff452d5be9
Undoes species economic modifiers from Polaris, leaves them all at the human amount
2018-04-25 17:53:10 -04: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
7d6fba3ba1
Merge pull request #5194 from Anewbe/species_economic
...
Species economic modifier is now a species var
2018-04-24 23:26:41 -07:00
c09412c33e
Implements the Mining Equipment Vendor
...
Adds the Mining Equipment Vendor machine, which sells lots of items for points earned by mining.
Enhanced the ore processor to give points for processed ore.
Added some miscellaneous items such as hyposprays for miners.
Switched mining machines to use the nice new icons.
2018-04-24 18:18:54 -04:00
2ef207df60
Fixed tilted sprites
2018-04-25 07:38:01 +10:00
218c17d268
Ported laser pointer. It lets you point at stuff with lasers.
2018-04-24 12:59:27 -04:00
43b8c1720c
Adds the Kinetic Accelerator
...
A mining gun, this upgradable energy weapon can mine mineral turfs at a distance. It does only 25% of nominal damage when fired indoors.
It can be upgraded with modkits, giving it range, pretty colors, aoe against minerals or mobs.
2018-04-24 12:59:23 -04:00
051384ee22
Adds the Resonator
...
A device which sets up resonating energy fields which collapse, mining mineral turfs and/or doing damage to any mobs standing inside. Does no damage to anything else, and damage to mobs is only high when used in low temperature environment (such as... outside or in space)
Uses quite a few dmis, for the icons, in hand icon, and effect icons. Includes sound effects
Ported from tg and Paradise
2018-04-24 12:57:50 -04:00
d5c9d3cb4e
Port /tg/ lavaland shelters
...
Nanotech twist rather than bluespace, but whatever.
2018-04-23 15:25:35 -04:00
Sharkmare