Commit Graph
7492 Commits
Author SHA1 Message Date
VerkisterandGitHub 615928c31f Merge branch 'master' into hangryrat 2018-05-02 10:48:57 +03:00
AtermoneraandGitHub 847590758b Merge pull request #5233 from VOREStation/pol-vs-3594
Resolve shower curtain/steam layering issue
2018-05-01 13:02:16 -07:00
AtermoneraandGitHub c3ac0870b6 Merge pull request #5235 from VOREStation/pol-vs-3611
Fix wonky PDA eject messages
2018-05-01 13:01:26 -07:00
AtermoneraandGitHub 44cc2e26c7 Merge pull request #5229 from Neerti/4/29/2018_remove_world_REMOVE_WORLD
for(var/bad_code in world)
2018-05-01 13:00:18 -07:00
AtermoneraandGitHub b75b3c539e Merge pull request #5226 from Lorwp/drillmeta
Destroys Drill meta 2: Electric Boogaloo
2018-05-01 12:38:19 -07:00
MechoidandAtermonera 1db4c4b677 ~Promethean Tweaks: The one with the chemicals, and the other thing. (#5201)
* Promethean Tweaks Round Howevermany We're On Now

* Tweak again. Drinks only plink damage that can be regenned. Multiple drinks, or other sources of tox will still mean these are dangerous.

* Add Blurb other than just "What has science done?"

* Adds the changelog.

* Fixes the stupid.

* Fixfix @ Ater
2018-05-01 12:23:47 -07:00
AnewbeandGitHub 7eaff9b3e0 Merge pull request #5222 from VOREStation/pol-freezer
Increase zealousness of Portable Freezer item whitelist
2018-05-01 10:18:34 -05:00
Arokha Sieyes ce5c7619b9 Fix wonky PDA eject messages
As reported in https://github.com/VOREStation/VOREStation/issues/3611, attempting to eject a cart on a PDA when there's no cart tells you that you can't do that while you're restrained, which isn't very explanatory.
2018-04-30 15:39:48 -04:00
Aronai SieyesandGitHub 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
Verkister f8d6449bc1 pathing update 2018-04-30 20:30:16 +03:00
Arokha Sieyes 28c300359b 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-04-30 12:50:47 -04:00
Neerti be73b8c36a for(var/bad_code in world)
Removes a very large amount of world loops.
Adds a macro to painlessly generate a global list, and the needed code to modify the list when an object is made or deleted automatically.
Cleans up some commented out code.
2018-04-29 17:55:04 -04:00
Very-Soft 5715e58691 Adds signs and bones to the underdark! 2018-04-28 23:31:05 -04:00
Spades b06b1d16a8 Makes file pathing for mobs not complete autism 2018-04-28 13:37:41 -04:00
Reddeyfish 1c1ab01a69 Merge branch 'virgoMaster' into virgoPull 2018-04-28 10:12:34 -07:00
Lorwp 1120e53d36 Destroys Drill meta
Makes screwdriver hand drills not fit in places a normal screwdriver can
2018-04-28 20:05:19 +10:00
Arokha Sieyes 1d0aeb95bd Increase zealousness of Portable Freezer item whitelist 2018-04-27 20:16:57 -04:00
Verkister f01a8fffe3 hurrgh 2018-04-28 00:28:15 +03:00
Leshana f508841fff Refactor common template HTML for atmospheric scan into its own file.
As a demonstration of the partials inclusion feature, the HTML for the atmospheric scan screen (which was nearly identical between PDAs and Communicators) was moved into a separate file and then transcluded into both pda.tmpl and communicator.tmpl
Also added a README.dm with the very basics of nanoui and template transclusion, and fixed comments in nano_state.js
2018-04-27 14:42:42 -04:00
Woodratt 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
Arokha Sieyes 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
Arokha Sieyes ab1351f00d Ports the medical item sounds from Bay
A port of https://github.com/Baystation12/Baystation12/pull/21268, which adds sounds to the healing item stacks, taperolls, and hyposprays
2018-04-25 14:39:49 -04:00
Leshana 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
Leshana 218c17d268 Ported laser pointer. It lets you point at stuff with lasers. 2018-04-24 12:59:27 -04:00
Leshana 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
Leshana 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
Unknown 906db88b6a Dufflebag of Holding
Adds a dufflebag of holding, essentially a bag of holding reskin that functions exactly identical
2018-04-24 02:09:39 -04:00
AnewbeandGitHub 4a039d94a5 Merge pull request #5196 from Schnayy/plushiefix
Carp Plushie Fix
2018-04-22 11:49:52 -05:00
Schnayy b56299cc57 - Fixes carp plushies to now have a base sprite & be selectable in the loadout.
- Adjusts gift vendor to have a few of the newer plushies, as well as change them to cost thaler rather than a coin.
- Champagne is now a premium item rather than contraband.
2018-04-20 09:55:09 -05:00
Leshana 438203393e POLARIS: Fix cutting of bedsheets while holding them.
Cutting bedsheets while holding them dropped the resulting rags in the mob's contents.
2018-04-19 20:51:25 -04:00
Aronai SieyesandGitHub 6f57022a0c Merge pull request #3448 from VOREStation/aro-taurriding
Lazily implements taur riding
2018-04-19 20:21:46 -04:00
Aronai SieyesandGitHub 35ec513b28 Merge pull request #3452 from VOREStation/aro-sync-04122018
Polaris Sync 04-12-2018
2018-04-18 14:04:27 -04:00
Aronai SieyesandGitHub 80c8bb5e34 Merge branch 'master' into aro-taurriding 2018-04-18 14:01:50 -04:00
MarinaGryphonandAnewbe 9e57b11a87 Fixes various implant/admin verb typos (#5177)
* Removes 'independant'

* Update Space Station 13 areas.dm

* Fixes the AI law typo

* Fixes another typo.

Somewhat out of scope(?), but it's just a typo.
2018-04-17 23:05:12 -05:00
AnewbeandGitHub c29d830e28 Merge pull request #5166 from Heroman3003/closet-coloring-fix
Fixed closet painter making non-closet 'closets' invisible
2018-04-17 23:04:43 -05:00
Leshana 989d8a727d POLARIS: Fix cutting of bedsheets while holding them.
Cutting bedsheets while holding them dropped the resulting rags in the mob's contents.
2018-04-17 20:24:06 -04:00
ReddeyfishVorandGitHub 9da313d67d Modify mining mob frequencies 2018-04-16 00:31:34 -07:00
Verkister ed1e1aaa5c renames to bigrat, adds neutral one to pred crate as well 2018-04-16 09:51:59 +03:00
Leshana b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14
# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
2018-04-15 14:19:36 -04:00
Reddeyfish 0af8620ee1 Merge branch 'virgoMaster' into virgoPull 2018-04-15 11:06:40 -07:00
Reddeyfish a6bed61e77 add asteroidMobs 2018-04-14 22:33:43 -07:00
AnewbeandGitHub fd29a3b841 Merge pull request #5165 from VOREStation/port-fix-wall-frames
Fix Wall Frames - Several Ways
2018-04-13 14:03:34 -05:00
AnewbeandGitHub 8adf777a72 Merge pull request #5167 from Heroman3003/sheet-snatch-fix
Fixed sheet snatcher spawning stacks with wrong looking icon
2018-04-13 14:01:17 -05:00
Aronai SieyesandGitHub 83c27b175f Merge pull request #3446 from Heroman3003/fuzzy-legcuffs
Added fuzzy legcuffs
2018-04-12 18:42:54 -04:00
Arokha Sieyes 1273ca9ed4 Lazily implements taur riding
It's pretty lazy. I'm sure someone with *effort* can touch it up.
2018-04-12 15:10:17 -04:00
Heroman3003andHeroman3003 1ff2f26889 Fixed legcuffs checking for being handcuffed instead of legcuffed when put on 2018-04-13 05:00:18 +10:00
Heroman3003 dd2a46281e Added fuzzy legcuffs 2018-04-13 04:56:16 +10:00
Aronai SieyesandGitHub 298def0af5 Merge pull request #3438 from Verkister/dur
Adds deer taur.
2018-04-12 11:51:42 -04:00
Aronai SieyesandGitHub 8afd5cad9a Merge pull request #3441 from Verkister/rous
Adds giant rat voremob.
2018-04-12 11:51:29 -04:00
Heroman3003 32daa7a0d2 Fixed sheet snatcher spawning stacks with wrong looking icon 2018-04-12 21:55:24 +10:00