Commit Graph

15028 Commits

Author SHA1 Message Date
Anewbe
a0ffc104bf Bioprinters and Cloners now use Biomass reagent, maps in a Bioprinter 2018-06-16 13:41:40 -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
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
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
c81757bcf9 Merge pull request #3880 from Verkister/vsedits
Couple VS edit fixes.
2018-06-15 09:12:30 -04: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
Verkister
ac94d82ba1 Couple VS edit fixes.
-Fixes borg sleepers nuking passengers on cryo despawn.
-Fixes mimics dropping their guts.
2018-06-15 10:24:39 +03: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
6b55a44254 Merge pull request #3850 from VOREStation/upstream-merge-5336
[MIRROR] Cult robes use the right sprite again
2018-06-11 06:11:30 -04:00
Aronai Sieyes
a2f8abd12c Merge pull request #3841 from VOREStation/upstream-merge-5334
[MIRROR] Ater forgot to remove debug code
2018-06-11 06:08:49 -04: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
876068eeda Merge pull request #5336 from Anewbe/cult_robe_sprite_fix
Cult robes use the right sprite again
2018-06-09 15:40:38 -04:00
Anewbe
178cffe6de Merge pull request #5334 from Atermonera/aters_a_donk_round2
Ater forgot to remove debug code
2018-06-06 20:37:32 -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
Aronai Sieyes
40b1a56bdc Revert "Revert "Upgrades Planetary Weather to vis_contents (#5170)"" 2018-06-01 20:35:28 -04:00
Aronai Sieyes
4141fc0b42 Merge pull request #3805 from VOREStation/upstream-merge-5313
[MIRROR] Move character join log statement
2018-06-01 10:00:29 -04:00
Anewbe
25a6fb865a Merge pull request #5313 from VOREStation/pol-joblogmove
Move character join log statement
2018-05-31 21:33:31 -04:00
Anewbe
2fba824a89 Merge pull request #5310 from Heroman3003/arcade-fix
Fixed arcades dispensing their own board
2018-05-31 21:33:20 -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
Aronai Sieyes
e1176af1fe Merge pull request #3783 from VOREStation/upstream-merge-5307
[MIRROR] Split and clarify global lists of processing vs non-processing machinery.
2018-05-28 20:59:11 -04:00
Aronai Sieyes
d4d4bf17f7 Merge pull request #3782 from VOREStation/upstream-merge-5306
[MIRROR] Move space/New to space/initialize
2018-05-28 20:58:59 -04:00
Leshana
d430448ebf Split and clarify global lists of processing vs non-processing machinery. (#5307)
* Renaming local var 'machines' to avoid confusion with the global var of same name.

* Delete the unused process scheduler machinery.dm file.  Long since replaced with SSmachines

* Split and clarify global lists of processing vs non-processing machinery.

- Renamed the list of processing machinery from "machines" to "processing_machines"
- Added new global list "machines" to be a list of all machines.
- Since nearly every reference to machines actually wanted to iterate over all machines anyway, this works out great.
2018-05-28 15:57:02 -04:00
Leshana
30f10be83e Split and clarify global lists of processing vs non-processing machinery. (#5307)
* Renaming local var 'machines' to avoid confusion with the global var of same name.

* Delete the unused process scheduler machinery.dm file.  Long since replaced with SSmachines

* Split and clarify global lists of processing vs non-processing machinery.

- Renamed the list of processing machinery from "machines" to "processing_machines"
- Added new global list "machines" to be a list of all machines.
- Since nearly every reference to machines actually wanted to iterate over all machines anyway, this works out great.
2018-05-28 12:56:49 -07: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
Atermonera
2ba143a332 Merge pull request #5306 from VOREStation/aro-spaceinit
Move space/New to space/initialize
2018-05-28 15:50:39 -04:00
Atermonera
1a42238ac3 Merge pull request #5306 from VOREStation/aro-spaceinit
Move space/New to space/initialize
2018-05-28 12:50:05 -07: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
Arokha Sieyes
03111ab249 Move space/New to space/initialize
I'm not sure how you expect starlight to work when you're checking for neighbors that don't exist yet.
2018-05-27 14:02:34 -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
Mechoid
917c7b71a5 Box of Things for Events and the Future MK1 (#5281)
* Lots of Stuff for Events

* Adds changelog.

* Review & QOL
2018-05-25 16:26:31 -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
Atermonera
5957251397 Merge pull request #5280 from Anewbe/poi_tweaks
Merc PoI Tweaks
2018-05-25 10:56:40 -07:00