2802 Commits
Author SHA1 Message Date
Arokha Sieyes 2d1e2d091e Fix 'Spawn Character' DNA
Made spawned characters always use male sprites and not have accurate DNA. Also would runtime if you picked the option to not put a mind in, as it assumed there would be one.
2017-04-10 14:39:09 -04:00
Kelshark 4cec8849a2 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	config/custom_items.txt
#	icons/mob/widerobot_vr.dmi
2017-04-09 09:56:44 -04:00
Anewbe e9c4b5a3eb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	icons/mob/back.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
2017-04-07 16:11:50 -05:00
Arokha Sieyes 85a489b9b6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2017-04-04 20:25:00 -04:00
AnewbeandGitHub 6a95f6c87f Merge branch 'master' into apron_pockets 2017-04-04 17:54:38 -05:00
Anewbe 1e7bf50a4c Automute shouldn't go off if you didn't type anything 2017-04-03 14:14:52 -05:00
Anewbe 8e9db2b7d4 Aprons now have pockets 2017-04-02 00:28:20 -05:00
Anewbe 7bb3f5fbb7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	code/datums/supplypacks/medical.dm
#	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
#	code/modules/clothing/shoes/miscellaneous.dm
#	code/modules/clothing/suits/labcoat.dm
#	icons/mob/back.dmi
#	icons/mob/feet.dmi
#	icons/mob/human_face.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/shoes.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/storage.dmi
#	maps/northern_star/polaris-2.dmm
#	maps/northern_star/polaris-5.dmm
2017-04-01 12:45:45 -05:00
JoanRisu bd9d9c5078 Fixes typo for dune buggy in code and adds fluff boxes to the quick create menu. 2017-03-27 01:58:49 -07:00
Kelshark 139dbf132c Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/RandomZLevels/listeningpost.dmm
#	vorestation.dme
2017-03-26 00:20:03 -04:00
AnewbeandGitHub 560af2d61d Merge pull request #3116 from VOREStation/spawn
Makes the 'Spawn Character' verb include custom items
2017-03-21 18:38:23 -05:00
Arokha Sieyes 17bd2d341a Makes the 'Spawn Character' verb include custom items
Only really works if you pick the option to put them in the mob, because the proc that spawns custom items is based on that, and I don't really want to rework the custom items system for such a small fix.
2017-03-21 09:48:55 -04:00
Arokha Sieyes 25a84af366 Makes the 'Spawn Character' verb include custom items
Only really works if you pick the option to put them in the mob, because the proc that spawns custom items is based on that, and I don't really want to rework the custom items system for such a small fix.
2017-03-21 09:44:02 -04:00
Arokha Sieyes 805b473976 Polaris Sync Merge
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -04:00
Kelshark ea669886d0 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/mob/language/station_vr.dm
#	code/modules/surgery/robotics.dm
#	config/custom_items.txt
2017-03-17 19:28:02 -04:00
NeertiandGitHub d4b6fc9f32 Merge pull request #3052 from Anewbe/emp_things
Reworks empulse and emp_act
2017-03-14 21:39:01 -04:00
AnewbeandGitHub 5481e90cbe Merge pull request #3074 from VOREStation/recipes
"Recipe Dump" admin verb
2017-03-13 17:17:54 -05:00
Arokha Sieyes 9bdd3495af "Recipe Dump" admin verb
The idea of updating the wiki list of recipes is daunting, especially getting all the icons and resizing them to look nice on a webpage, so fuuuuuuuuck that.

I made a verb that does it. It dumps upsized (64x64) images of every food icon and a recipes.html file into your cache with a table that contains all the recipes, nicely formatted, in alphabetical order (the -burger and -kebab at the top are because those are [whatever-meat]-burger and [whatever-meat]-kebab).

Then you can just throw them on a website. It will include a recipes.css file if it's in the same dir.
Here's the result on our server:
https://vore-station.net/infodump/recipes.html
2017-03-13 18:01:03 -04:00
Kelshark 25d81c8acf Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/admin/verbs/buildmode.dm
#	code/modules/multiz/movement.dm
#	code/modules/multiz/structures.dm
#	code/modules/multiz/turf.dm
#	config/custom_items.txt
#	vorestation.dme
2017-03-10 20:34:12 -05:00
Arokha Sieyes 4f47ce2d77 "Recipe Dump" admin verb
The idea of updating the wiki list of recipes is daunting, especially getting all the icons and resizing them to look nice on a webpage, so fuuuuuuuuck that.

I made a verb that does it. It dumps upsized (64x64) images of every food icon and a recipes.html file into your cache with a table that contains all the recipes, nicely formatted, in alphabetical order (the -burger and -kebab at the top are because those are [whatever-meat]-burger and [whatever-meat]-kebab).

Then you can just throw them on a website. It will include a recipes.css file if it's in the same dir.
Here's the result on our server:
https://vore-station.net/infodump/recipes.html
2017-03-10 18:25:48 -05:00
Leshana 12ab0e4da2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06 2017-03-06 22:46:28 -05:00
Leshana a5a805414b Fixed paths references to obsolete path /obj/item/clothing/shoes/combat
* It was changed in most places to /obj/item/clothing/shoes/boots/combat but some were not.  The changling subtype prevented any compile errors.
2017-03-06 21:58:39 -05:00
Leshana f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme
2017-03-06 20:58:38 -05:00
AnewbeandGitHub 05e6ef5ad8 Merge pull request #2988 from Anewbe/boots
Boots are now a subtype of shoes
2017-03-05 14:13:47 -06:00
Anewbe 19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06:00
Kelshark 081e280e27 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/global.dm
#	config/custom_items.txt
#	icons/mob/human_races/r_xenochimera.dmi
#	vorestation.dme
2017-03-03 19:17:04 -05:00
Neerti 0f781e36a7 Adds Multi-Z Test Map 2017-03-03 09:40:34 -05:00
Arokha Sieyes 387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Anewbe 25b925f04c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots
# Conflicts:
#	maps/northern_star/polaris-1.dmm
#	maps/northern_star/polaris-2.dmm
2017-03-02 16:53:29 -06:00
Neerti 12abb2d6f2 Ports a large chunk of the map datum system that europa/bay uses.
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
Anewbe 2de037fbbf Ports a bunch of fluff stuff 2017-02-21 13:50:14 -06:00
Neerti d398367e4c Fixes a world << that crept in and apparently new lobby code. 2017-02-20 19:29:13 -05:00
Neerti 91dd3348c5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/2/2017_planet_stuff
# Conflicts:
#	code/modules/mob/living/carbon/human/human_movement.dm
2017-02-20 19:06:25 -05:00
Neerti 836d8dfa3f More stuff, finalizes it I hope. 2017-02-20 18:28:31 -05:00
Arokha Sieyes a6ed469aca Finishing touches
Make mind records get removed when you cryo.
Added resleeving manual.
Commit virgo-7 because mapmerge constantly says it has changes. BeyondCompare says there aren't any. Probably some formatting change but it'll probably do it for everyone until I do it.
Move where backup implants are (put them in resleeving room)
Only Posibrains are indigestible. MMIs are. Squishy brainmeat!
Unrelated icon change to station announcements by admins.
2017-02-19 20:46:55 -05:00
Kelshark 8df7fcd10a Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	.gitignore
#	vorestation.dme
2017-02-18 09:40:18 -05:00
Arokha SieyesandGitHub c141e8b440 Merge pull request #954 from VOREStation/roguelike
Miner Minigame
2017-02-14 20:55:10 -05:00
Arokha Sieyes e4557b0724 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-14 20:29:57 -05:00
Arokha Sieyes 9817d67461 More initial codework on rogue miner. 2017-02-12 21:04:31 -05:00
Kelshark 5b6c8aeab6 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/clothing/under/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/human_movement.dm
#	config/custom_items.txt
2017-02-12 00:32:26 -05:00
Anewbe 7417bef794 Boots are now a subtype of shoes 2017-02-05 16:17:41 -06:00
AnewbeandGitHub 68ea9a6e69 Adds a fix 2017-02-04 21:11:23 -06:00
Leshana 654a6bae03 Implemented adminhelp relay to discord.
* Adminhelp messages get sent to discord via the chat webhook.
2017-02-04 17:54:07 -05:00
Kelshark 9ce88c8c6c Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
#	config/custom_items.txt
#	icons/obj/gun.dmi
#	maps/virgo-1.dmm
#	vorestation.dme
2017-02-03 21:35:22 -05:00
killer653 3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Anewbe dd38e42dc5 Ahelp take button 2017-01-31 15:27:07 -06:00
Kelshark a0a702b60b Fixed mute issues and map stairs issues 2017-01-28 00:14:04 -05:00
Neerti 086551bfd9 Improves Lobby News
Adds ability to add most html formatting to lobby news without actual html.
2017-01-26 00:37:38 -05:00
Anewbe ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00
Kelshark c57914a426 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/admin/verbs/adminhelp.dm
#	maps/virgo-1.dmm
2017-01-21 01:42:11 -05:00