Reddeyfish
635013f331
Merge branch 'virgoMaster' into virgoPull
2018-06-10 12:33:29 -07:00
Anewbe and VirgoBot
1800e1696f
Merge pull request #5325 from elgeonmb/patch-7
...
Changes experimental welder fluff
2018-06-04 16:13:35 -04:00
Anewbe and VirgoBot
7528ac54fb
Merge pull request #5305 from VOREStation/pol-autosay
...
Prevent autosay() from creating/deleting AIs
2018-06-02 12:47:27 -04:00
Novacat and Aronai 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
Arokha Sieyes
c0c091ed4a
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-29-2018
...
# Conflicts:
# code/modules/power/lighting.dm
# icons/turf/walls.dmi
2018-05-29 21:05:27 -04:00
Anewbe and GitHub
d308cb4563
Merge pull request #5269 from deathride58/fancylighting
...
Makes lighting a little fancier, reduces the amount of light sources with a power greater than 1
2018-05-29 13:33:27 -05:00
Sharkmare and GitHub
6ec3003bbf
Toolbelt can now hold the circuit debugger
...
Finally.
2018-05-28 23:40:51 +02: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
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
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
Unknown
2c1ad0076f
Requested Fixes
2018-05-22 12:49:41 -04:00
Reddeyfish
813d7bf643
Merge branch 'virgoMaster' into virgoPull
2018-05-19 17:16:17 -07:00
Tad Hardesty
927050ce44
Fix various syntactic problems
2018-05-16 21:43:18 -07:00
Anewbe and GitHub
1a29f5f009
Merge pull request #5264 from VOREStation/pol-ssao-ex
...
SSAO object excludes
2018-05-16 19:28:39 -05:00
deathride58
718ca41ea0
tweaks a bunch of lighting values. reduces the amount of light_power values greater than 1
2018-05-16 01:42:01 -04:00
PrismaticGynoid and Atermonera
eabfa03891
Laser pointers ( #5257 )
...
* Laser pointers
Adds laser pointers, ported from tg/oldaurora (but heavily modified). They can be found in the loadout, as well as made by science. Science can also upgrade them, which makes them occasionally useful for blinding people, too.
The bugfixes which make several of the features work properly will come in a separate commit.
* Three fixes
Cats now have resting sprites for all 4 directions, instead of just east. This was needed to make cats look like they're pouncing on the laser dot.
Cameras can now be EMPed more than once, and EMPs actually are able to disable them now. This was needed for the shining lasers into cameras feature.
Flash_eyes() now actually displays a flashing animation on your screen when you get flashed (except for silicons, who for some reason are excluded from this unless EMPed). This was needed for laser pointers to have a temporary "blinding" effect when shone into someone's eyes.
(removes errant debug message too, whoops)
* Nerf
Reduced chances of laser pointers doing anything useful on silicons.
Also, fixes a duplicated proc, oops.
* Requested changes
Minor changes as requested - 'cell' to 'diode', view() to viewers(), range() to viewers().
Stops buckled or dead cats from reacting to laser pointers. Zombie cats are fun, but no.
Also, does another small nerf to the effects on silicons.
2018-05-14 15:22:19 -07:00
drexample and Atermonera
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
Arokha Sieyes
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
Arokha Sieyes
91f0c05a4b
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:38:22 -04:00
Leshana
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
Spades and GitHub
ba5bfa00bb
Merge pull request #3583 from Verkister/chompychomp
...
Adds a funky fresh feature to beartraps.
2018-05-05 08:32:38 -04:00
Cameron653 and GitHub
e47fe15fbf
Fixes a comment that caused developers to scratch their heads.
...
Glass has a hardness of 30 https://github.com/PolarisSS13/Polaris/blob/master/code/modules/materials/materials.dm#L433
Thrown_force_divisor multiplies by 1.5.
WHY THE HELL IS THIS A MULTIPLIER INSTEAD OF A DIVISOR ???? WHAT MADMAN NAMED THESE VARIABLES? https://github.com/PolarisSS13/Polaris/blob/master/code/game/objects/items/weapons/material/material_weapons.dm#L56
p.s: Marble spear does 50 damage per hit. may wanna nerf that. It's a 2 tile attack that does 50 damage.
When thrown, marble spear does 39 damage, since it multiplies the blunt damage (26) by 1.5
2018-05-03 22:44:07 -04:00
Atermonera and GitHub
2a16467f8a
Merge pull request #5219 from VOREStation/vplk-nanoui-multi-template
...
NanoUI multiple templates example.
2018-05-03 11:12:56 -07:00
Anewbe and GitHub
70b23e905e
Merge pull request #5209 from VOREStation/pol-medsound
...
Ports the medical item sounds from Bay
2018-05-02 22:11:03 -05:00
Neerti and GitHub
cd2a538526
Merge pull request #5207 from Novacat/bluespace_duffle
...
Dufflebag of Holding
2018-05-02 22:41:27 -04:00
Atermonera and GitHub
c3ac0870b6
Merge pull request #5235 from VOREStation/pol-vs-3611
...
Fix wonky PDA eject messages
2018-05-01 13:01:26 -07:00
Atermonera and GitHub
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
Atermonera and GitHub
b75b3c539e
Merge pull request #5226 from Lorwp/drillmeta
...
Destroys Drill meta 2: Electric Boogaloo
2018-05-01 12:38:19 -07:00
Mechoid and Atermonera
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
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
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
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
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
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
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
MarinaGryphon and Anewbe
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
Anewbe and GitHub
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
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
Anewbe and GitHub
fd29a3b841
Merge pull request #5165 from VOREStation/port-fix-wall-frames
...
Fix Wall Frames - Several Ways
2018-04-13 14:03:34 -05:00
Anewbe and GitHub
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 Sieyes and GitHub
83c27b175f
Merge pull request #3446 from Heroman3003/fuzzy-legcuffs
...
Added fuzzy legcuffs
2018-04-12 18:42:54 -04:00
Heroman3003 and Heroman3003
1ff2f26889
Fixed legcuffs checking for being handcuffed instead of legcuffed when put on
2018-04-13 05:00:18 +10:00
Reddeyfish