Commit Graph

7494 Commits

Author SHA1 Message Date
Atermonera
fe94038e7a Recharger refactor 2018-06-16 17:15:59 -04:00
Aronai Sieyes
c6fae09c1d Merge pull request #3888 from VOREStation/upstream-merge-5322
[MIRROR] Move planets to SSplanets
2018-06-16 13:57:09 -04:00
Aronai Sieyes
62b5386eb3 Merge pull request #3890 from VOREStation/upstream-merge-5337
[MIRROR] Folders props, and adds the laser prism, receptor, and sealed doors.
2018-06-16 10:51:29 -04:00
Aronai Sieyes
abd67bb983 Merge pull request #3889 from VOREStation/upstream-merge-5282
[MIRROR] Allows AIs to produce and control maint/construction/mining drones.
2018-06-16 10:51:20 -04:00
Arokha Sieyes
7c050dd35c Fix merge conflict, update virgo planet things 2018-06-16 10:43:45 -04:00
Mechoid
3c35b7d13a Folders props, and adds the laser prism, receptor, and sealed doors. (#5337)
* Re-bases props, and adds the laser prism.

* Ver 1 of Puzzle Lock and Doors

* Doors

* Fix door hiccup I made, modify Prism
2018-06-15 21:42:19 -04:00
Mechoid
9b00166de0 Allows AIs to produce and control maint/construction/mining drones. (#5282)
* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.
2018-06-15 20:15:03 -04:00
Anewbe
98b3af60fa Move planets to SSplanets 2018-06-15 19:05:38 -04:00
Hawk_v3
15403798d8 Fixed missing backsprites
Forgot about those. I simply renamed the tanks as the old one was removed anyway. Apologies.
2018-06-15 22:49:38 +01:00
Hawk_v3
1db1280651 Merge remote-tracking branch 'upstream/master' 2018-06-15 22:46:14 +01:00
Aronai Sieyes
a162c86d51 Merge pull request #3855 from VOREStation/upstream-merge-5341
[MIRROR] Wires are under catwalks, fueltanks are over floor decals
2018-06-15 08:57:22 -04:00
Hawk_v3
9a3933517d Fix and Additions to Vox Tanks
Fixed Vox double tanks spawning in internal boxes.
Added indicator to Vox back tank, shifted sprite two pixels to reuse double tank indicators.
Added strip to Vox emergency tank to bring in line with back and double tanks.
2018-06-12 17:59:38 +01:00
Aronai Sieyes
97465264c3 Merge pull request #3840 from VOREStation/upstream-merge-5323
[MIRROR] Wallet money spawns as a bundle.
2018-06-11 06:08:31 -04:00
Ketrai
c351f1d3b0 Adds a fennec crate to cargo. (#3810)
* Adds a fennec crate.

Adds a fennec crate with a smaller chance of containing fennix.

* Adds a fennec crate

* Update hydroponics_vr.dm

* Fixes an error?

* Update largecrate_vr.dm

* Update largecrate_vr.dm
2018-06-11 06:06:49 -04:00
Atermonera
d768871055 Merge pull request #5341 from Anewbe/catwalks_again
Wires are under catwalks, fueltanks are over floor decals
2018-06-10 15:41:54 -04:00
Atermonera
190dd08fc4 Merge pull request #5323 from Anewbe/loadsamoney
Wallet money spawns as a bundle.
2018-06-06 19:08:31 -04:00
Anewbe
1800e1696f Merge pull request #5325 from elgeonmb/patch-7
Changes experimental welder fluff
2018-06-04 16:13:35 -04:00
Aronai Sieyes
b0f21a938b Merge pull request #3822 from VOREStation/upstream-merge-5305
[MIRROR] Prevent autosay() from creating/deleting AIs
2018-06-02 19:03:02 -04:00
Anewbe
b5eea2cffa Merge pull request #5320 from VOREStation/pol-hoods
Radiation closet hood fix
2018-06-02 16:23:08 -04:00
Anewbe
7528ac54fb Merge pull request #5305 from VOREStation/pol-autosay
Prevent autosay() from creating/deleting AIs
2018-06-02 12:47:27 -04:00
Arokha Sieyes
27de80991a Fix the New() on this interfering with my work! 2018-06-02 11:27:46 -04:00
Novacat
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
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
Atermonera
5c4bde965a Merge pull request #5304 from VOREStation/vplk-reverse-all_atoms
Reverse use of global lists where they hurt performance.
2018-05-28 15:55:55 -04:00
Verkister
1222e5d0d6 Merge branch 'master' into hangryrat 2018-05-28 15:08:53 +03:00
Arokha Sieyes
b96aec1e52 SYNC: Missed another closet (typo) 2018-05-27 19:53:45 -04:00
Arokha Sieyes
1437123502 SYNC: Missed one 2018-05-27 19:43:39 -04:00
Arokha Sieyes
8f8c41a7c1 SYNC: Correct vorestation closets/crates to use new system 2018-05-27 19:33:34 -04: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
Leshana
0994c9dbe7 Removes the global lists all_clothing, all_items, all_objs, and all_atoms for performance reasons.
- The cost of maintaining these lists is more than the benefit of having them (mostly used only for debugging code)
2018-05-27 15:20:40 -04:00
drexample
be5c144a16 Ports Baystation12 newest item pickup animations. Fancy! (#5302)
* fixed photos

* Added item pick up animation

* Revert useless commit

* Removed unnecessary extra define, made sure ghost object deletes itself after animation, changed planes.
2018-05-27 11:54:36 -05:00
Atermonera
e1fe4d5a5d Merge pull request #5293 from VOREStation/pol-closets
Makes closets/crates like boxes
2018-05-26 15:24:45 -07:00
Atermonera
f1b00c9e26 Merge pull request #5292 from Anewbe/crate_layer
Crates should always appear below their contents
2018-05-25 16:25:31 -07: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
Anewbe
9bc6663930 Crates should always appear below their contents 2018-05-24 17:24:14 -05: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
Atermonera
73450f337d Merge pull request #5284 from Anewbe/item_zoom
Swapping hands cancels zoom
2018-05-24 13:19:36 -07:00
Aronai Sieyes
03e709d92f Merge pull request #3739 from Novacat/MiscTweaks
New Explorer Gear
2018-05-24 09:18:51 -04:00
Unknown
2c1ad0076f Requested Fixes 2018-05-22 12:49:41 -04:00
Anewbe
0647b05cd3 Swapping hands cancels zoom 2018-05-21 23:17:46 -05:00
Anewbe
7e44e95d24 Corrects some plane and layer issues 2018-05-20 18:41:21 -05:00
Arokha Sieyes
7ec5adf010 Remove some missed spare helmets
Fixes #3724
2018-05-18 14:42:29 -04:00
Tad Hardesty
927050ce44 Fix various syntactic problems 2018-05-16 21:43:18 -07:00
Anewbe
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
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
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