Commit Graph

907 Commits

Author SHA1 Message Date
Repede
123050bcd0 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
# Conflicts:
#	code/game/jobs/job/civilian_chaplain.dm
#	code/modules/mob/language/station_vr.dm
2018-07-08 11:38:06 -04:00
Anewbe
f0a7b2466e Merge pull request #5390 from VOREStation/pol-planetstartup
Fixes some planets controller runtimes
2018-07-05 15:50:15 -04:00
Michael Gosselin
6e31645b50 Engine spawner fixes.
Engine spanwer now waits 30 seconds before spawning the engine.
Engine spawner no tells people when it's going to spawn an engine.
Engine spawner alerts the rest of the station to what engine was
selected.
Engine spawner no longer outright players or observers, it gibs them
instead.
Minor streamlining of some code bits.
2018-06-28 20:50:50 -04:00
Repede
c611d6f5b4 removes useless var in mapping_yw.dm 2018-06-27 21:09:11 -04:00
Michael Gosselin
e34737d9e6 Engine Building Console
Adds ans engine select console that let's players select what engine
they want, provided they do it in 15 minutes or so
2018-06-26 20:49:37 -04:00
Michael Gosselin
a47cf6841a Ground work for Player picked engines.
Lays down the ground work for players being able to select the engine at
the start of the round.
Proof of Concept using a pickEngine() proc that can be called from the
mapping controller.
2018-06-26 02:18:42 -04:00
Repede
8ea0e21fc6 Merge branch 'master' of https://github.com/Repede/YawnWiderStation into self
# Conflicts:
#	icons/mob/robots.dmi
2018-06-23 17:58:41 -04:00
Repede
2b21dbfd99 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
2018-06-23 17:53:13 -04:00
Hawk_v3
195f27e7b7 Remove Host Quickfix 2018-06-23 19:59:41 +01:00
Hawk_v3
d1691eb17c Commenting for clarity 2018-06-23 19:52:01 +01:00
Hawk_v3
6ef41abf91 For Quil and for style 2018-06-23 19:49:01 +01:00
Hawk_v3
d78b59b5b4 Transcore/NIF fix.
NIFs now have a flag, savetofile, which is set TRUE if durability is changed. It is set FALSE by Transcore saving them. This should stop the lag of many file saves.
2018-06-23 19:36:21 +01:00
Repede
4145525a1a Dabs on NIFs, also adds NSFW kit to blueshield locker until we make the custom gun kit 2018-06-23 12:38:20 -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
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
Repede
93cab07a5a Fixes autotransfer message 2018-06-04 23:26:12 -04:00
Repede
b83e867682 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/power/lighting.dm
2018-06-02 18:33:44 -04:00
Arokha Sieyes
29004fe093 Planet controller startup delay 2018-06-02 11:06:53 -04:00
Aronai Sieyes
40b1a56bdc Revert "Revert "Upgrades Planetary Weather to vis_contents (#5170)"" 2018-06-01 20:35:28 -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
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
Repede
7628d85140 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	config/custom_items.txt
2018-05-23 00:13:07 -04:00
Arokha Sieyes
6b4be2d7a8 Paranoid logging and byond account age
Adds the PARANOIA_LOGGING setting to config.txt (and PANIC_BUNKER which was missing for some reason) and updates example.

PARANOIA_LOGGING (also available as a verb for admins in Server) begins notifying admins of any 0day byond accounts, or users who have never joined before. For when you don't quite want to panic bunker.

Also makes this information available in player panel. Requires SQL connection.
2018-05-22 23:03:53 -04:00
Repede
9e69f25327 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/_helpers/unsorted.dm
2018-05-13 21:08:22 -04:00
Verkister
1c519d28ed More small fixes and such.
-Applies the suggested durability tweak.
-Makes backups save nif examine message.
-Makes new nifs spawn with the examine message if provided upon resleeving and such. Basically the initial character spawn pref loading was the only case that wasn't resetting the message to default.
-Fixes soulcatcher backups breaking ooc notes. (Applies ooc notes from character to the brainmob before saving it. Also includes brainmobs into the formerly human exclusive backup part responsible of saving nif and ooc notes to backups.)
-Makes soulcatcher backup feature back up the owner if dying inside a belly of a soulcatcher lacking pred. (SC backup setting was completely voided if the pred didn't have SC themselves so your shit would be gone for good)
-Fixes contaminate/digest_act sending holder mobs to shadow realm if holder is contained inside the equipment(storage/pockets) of a prey getting gurgled instead of the pred's gut. (As prey gear gets all contaminated at once while getting dumped in the gut, which would contaminate>digest_act the holder items prematurely during the gurgle dump.)
2018-05-11 13:49:16 +03:00
Atermonera
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
Neerti
62ce4196e5 Bonus: Make Travis Show the Active Edges 2018-04-29 18:43:02 -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
Neerti
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
Repede
372e145108 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm

Fixed conflicts, fixed race racism money bs
2018-04-27 21:45:13 -04:00
Arokha Sieyes
7a6ff116a3 POLARIS: Varset Callback 2018-04-27 20:05:11 -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
Anewbe
a75c575491 Merge pull request #5200 from VOREStation/vplk-stonedmc-sync
Port "The Punisher" (subsystems/MC impovement) from TG
2018-04-24 15:20:57 -05:00
Arokha Sieyes
ac7e949779 Tab2Space ssair 2018-04-23 17:23:03 -04:00
Arokha Sieyes
d5c9d3cb4e Port /tg/ lavaland shelters
Nanotech twist rather than bluespace, but whatever.
2018-04-23 15:25:35 -04:00
Arokha Sieyes
43299a5e3a POLARIS? - Pause SSair on map loading more thoroughly 2018-04-23 15:12:33 -04:00
Kyle Spier-Swenson
1884742ca2 Random micro optimization to the mc I thought of while looking at something else
We can save the second ss_flags access by using bitflag ma~~th~~gic
(Ported from tgstation/tgstation#36352)
2018-04-20 17:55:08 -04:00
Leshana
0094c74b64 Ports "The punisher!"
* From tgstation/tgstation#27196
* The mc will now punish subsystems that overrun their tick allotment with less allotment in later fires.
* The punisher also delays the next fire of subsystems that overrun. Because of how this is ends up being calculated, this will almost never actually kick in, but sometimes subsystems like garbage will overrun into multiple ticks, so delaying their next fire is needed.
* The punisher does not delay the next fire of SS_TICKER subsystems (tgstation/tgstation#34964)
Note: SS_KEEP_TIMING subsystems do not get their next fire delayed.
2018-04-20 17:55:07 -04:00
Leshana
63257bf40b Use define constants for subsystem init order and priority.
Replaced all hard coded numbers for subsystem priority with defines in subsystem.dm - Much easier to see them in order that way.
2018-04-20 13:18:55 -04:00
Repede
95a1fade33 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/clothing/gloves/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	config/example/motd.txt
#	icons/mob/human_face_or_vr.dmi
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme
2018-04-20 09:03:58 -04:00
Leshana
c4d714dea8 Replaces set_light with direct update_lumcount for planet suns.
Setting lights on every single turf takes way too long.  Instead of havingto create a light source for every single outdoor turf, we find the corners to light up and apply the sunlight to them directly.
We also make sure to avoid having planet sunlight being 4x too strong, which would happen if we naively looped over all corners of all outdoor turfs.
Note: This has the side effect of making the sun's light and color ACCURATELY reflected on turfs.  Previous code doubled up on light and appeared brighter than it should.
2018-04-18 21:54:58 -04:00
Leshana
471e544a61 Revert "Merge pull request #4779 from Neerti/2/1/2018_make_the_sun_not_lag_again"
This reverts commit f4df29713d, reversing
changes made to 337e5e7436.
2018-04-18 18:08:16 -04:00
Neerti
d81c990e22 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/1/2018_make_the_sun_not_lag_again 2018-04-13 11:26:12 -04:00
Leshana
9634cf04ce Don't kick admin observers for inactivity. They might be waiting for ahelps. 2018-04-02 22:48:00 -04:00
Leshana
6756c5a483 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
# Conflicts:
#	.travis.yml
#	code/ATMOSPHERICS/components/unary/outlet_injector.dm
#	code/__defines/_planes+layers.dm
#	code/__defines/chemistry.dm
#	code/__defines/mobs.dm
#	code/_helpers/mobs.dm
#	code/_onclick/hud/robot.dm
#	code/game/area/areas.dm
#	code/game/machinery/computer/supply.dm
#	code/game/machinery/cryopod.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/devices/communicator/messaging.dm
#	code/game/sound.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin.dm
#	code/modules/client/preference_setup/occupation/occupation.dm
#	code/modules/events/event_container.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/language/language.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_powers.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species_shapeshift.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_powers.dm
#	code/modules/mob/living/say.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/logout.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	code/modules/shuttles/shuttle.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/wildwest.dm
#	maps/southern_cross/items/clothing/sc_head.dm
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
2018-03-31 09:20:59 -04:00
Aronai Sieyes
7d3aec96fd Arranges lots of things into planes (#5072)
* Rearranges a billion things into planes

* Make cryotubes fancy

* Update Travis

* Fix hiding logic
2018-03-28 12:59:12 -07:00
Repede
7c6aadd829 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/security.dm
#	code/game/area/Space Station 13 areas.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
2018-03-23 20:25:18 -04:00
Neerti
70ac478aea Merge pull request #5065 from VOREStation/vs-port-3204
[PORT] Revamp logging for consistency
2018-03-20 21:13:47 -04:00
Atermonera
c1ed3a0c6c Merge pull request #5060 from Anewbe/away_kicker
AFK Kicker should affect ghosts and people in the lobby
2018-03-19 12:17:24 -07:00