Commit Graph

1251 Commits

Author SHA1 Message Date
Anewbe
09b01407e3 Adds Various Sounds, Looping Sound System 2019-03-27 03:55:21 -04:00
Novacat
0b13775536 Merge pull request #4596 from VOREStation/upstream-merge-5783
[MIRROR] Removes "allowed_roles" from Cloaks
2019-03-27 03:03:09 -04:00
Spades
41bcb6a729 Merge pull request #4805 from Sebbe9123/master
Changes vore egg_types to not interfere with mob egg_types.
2019-03-02 08:03:58 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Sebbe9123
22c9bd416e changes vore eggtype to not mess with mob eggtype 2019-02-25 12:03:07 +01:00
Unknown
a4317b1910 [5654] Makes this PR Compile
This one made me cry.
2019-02-23 12:30:16 -05:00
Spades
14fad52791 Merge branch 'master' into upstream-merge-5744 2019-02-23 11:51:40 -05:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Naidh
02ba929795 Removes "allowed_roles" from Cloaks (#5783)
Department ponchos had this same line removed back in February as part of #4843 - now, the same is (hopefully) being done for cloaks.
2018-12-18 21:19:18 -05:00
Spades
9b92dc1836 Merge pull request #4462 from Novacat/nova-basicfixes
Expedition Job and Gear tweaks
2018-12-08 09:44:15 -05:00
Cerebulon
0be6662dc5 Adds 12 new futuristic loadout clothing items + colour variants 2018-12-06 16:17:20 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Unknown
98433abd03 Code cleanup
Now with 75% Less //VOREStation Edit
2018-11-18 14:28:40 -05:00
Unknown
dcfecf6e85 Wrong file edited, loadouts configured proper 2018-11-05 20:00:31 -05:00
Unknown
433fa46ca8 Fixes some oversights 2018-11-05 14:23:35 -05:00
Aronai Sieyes
aca8fa397e Merge pull request #4450 from VOREStation/upstream-merge-5692
[MIRROR] Correctly fix surgery caps selection this time.
2018-10-23 12:33:29 -04:00
Atermonera
b2e676d216 Merge pull request #5692 from lbnesquik/Kates-Surgery-Fix
Correctly fix surgery caps selection this time.
2018-10-22 20:55:18 -04:00
Shophaune
7266f28757 Fix for duplicated loadout descriptions (#5694)
* Add files via upload

* Revert "Merge pull request #1 from Shophaune/plant-bag-ui-bug-fix"

This reverts commit 62a60d4f87774508621506b347c679191e1a242f, reversing
changes made to 6f909ce590.

* Borrowing Ibnesquik's descriptions to fix this issue quickly.
2018-10-21 14:23:59 -04:00
Neerti
e019d0c8ef Fixes new record bug. (#5685) 2018-10-20 03:36:16 -04:00
Atermonera
54a24d244f Merge pull request #5657 from lbnesquik/Kates-Cap-Fix
Move surgery caps into their own selection.
2018-10-13 17:13:32 -04:00
Aronai Sieyes
f9159296f9 Merge pull request #4358 from VOREStation/aro-traitstats
Log trait and species usage for metrics
2018-10-12 01:45:54 -04:00
Aronai Sieyes
a5afd37e18 Merge pull request #4318 from lbnesquik/Kates-Nevrean-Fix
Adds nevrean eggs.
2018-10-11 23:15:12 -04:00
Arokha Sieyes
ea0d6fc5a1 Log trait and species usage for metrics
Just some stuff for use in building statistics about characters
2018-10-11 20:49:33 -04:00
Anewbe
e4660c5838 Admin ticket system (for real this time) 2018-10-09 16:31:01 -04:00
lbnesquik
986dc248b0 Adds nevrean eggs. 2018-10-06 10:06:28 +02:00
Mewchild
19ed4485c1 Changes Secpatch Path in Loadout 2018-10-01 09:36:16 -05:00
Spades
587fd193a1 Merge pull request #4226 from Mewchild/MC-SecPatch
Adds Security Eyepatch
2018-10-01 09:20:37 -04:00
Spades
b8f240f199 Merge pull request #4282 from VOREStation/sync-09272018
Polaris Sync 09-27-2018
2018-10-01 08:43:03 -04:00
Spades
c0b0621503 Merge pull request #4166 from deathride58/characterdirectory
Adds the character directory
2018-09-27 19:35:53 -04:00
Arokha Sieyes
b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	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-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
2018-09-27 18:01:09 -04:00
Anewbe
3d4bed20c2 Merge pull request #5548 from Poojawa/pls-stop-moosic
Ports /vg/ instrument frame work, adds client based sound pref toggle.
2018-09-19 15:04:06 -05:00
Atermonera
f2ac15be91 Merge pull request #5511 from Anewbe/descriptors
Ports character physical descriptors from Bay
2018-09-17 11:21:28 -07:00
Anewbe
c12d7e25b0 Readds size traits 2018-09-13 17:22:11 -05:00
Neerti
3aca2c38e2 Yet Another Circuit Update (#5549)
* Circuit updates, adds new components, improves printer, new assemblies.

* Finishes powernet circuit.

* Adds wearable assemblies.

* Finialization before merging with GLOB port.

* Finishes circuit update, hopefully.

* Forgot to undo map.

* Removes debug output.
2018-09-12 20:51:32 -05:00
Mewchild
6446d813da Adds Security Eyepatch 2018-09-07 17:52:29 -05:00
Poojawa
6b403022a7 Ports /vg/ instrument frame work, adds client based sound pref
Also shifts sound files which is 98% of the bulk here.
2018-09-05 03:35:34 -05:00
Spades
7b86d2ba4f Merge pull request #4099 from VOREStation/upstream-merge-5450
[MIRROR] Fixed mining cloak not being in loadouts
2018-09-01 17:31:06 -04:00
Atermonera
de65c3c643 NanoUI now processes again 2018-08-25 21:13:16 -07:00
Anewbe
4fc94a6e47 Ports descriptors from Bay 2018-08-19 22:32:44 -05:00
Spades
69c0cd8b8c Merge pull request #3983 from Verkister/synthmarking
Couple VS compatibility tweaks on the synthlimb markings option.
2018-08-17 16:09:56 -04:00
Spades
6f35a33e1c Merge pull request #4068 from VOREStation/upstream-merge-5429
[MIRROR] Adds Marking Order Changing at Character Creation
2018-08-17 16:07:33 -04:00
deathride58
87859c77af adds a pref to enable/disable showing up in the character directory 2018-08-15 06:18:58 -04:00
Anewbe
e1471886d8 Fixes the bug(s) that allow meat bodies to have metal brains 2018-08-14 23:12:43 -05:00
Verkister
85a7c2d7d4 snip 2018-08-14 09:16:42 +03:00
Verkister
6cb51f741a Merge branch 'master' into synthmarking 2018-08-14 09:09:14 +03:00
kcin2001
187fc62e9c Adds new job/department specific teshari clothing to the loadout (#5481)
* adding the new department specific teshari outfits
2018-08-09 19:43:40 -07:00
Neerti
3de28fa6b2 Ambience Refactor (#5476)
* Refactors how ambience is assigned, removes bad ambience, ports good ambience from tg

* Apparently that file is still used, not worth the salt to remove it.

* Changelog
2018-08-06 11:12:17 -05:00
Atermonera
7b631c19f1 Merge pull request #5457 from PrismaticGynoid/colorblindnessforall
Lets people be colorblind
2018-08-01 09:01:27 -07:00
PrismaticGynoid
31e5769ff6 Whoops, worded that wrong 2018-07-30 22:08:31 -07:00
PrismaticGynoid
1a16d84bb5 Lets people be colorblind
Adds four types of colorblindness to the traits in the setup menu - protanopia, deuteranopia, tritanopia, and monochromacy. Previously, there were ones defined in the code, but not actually usable to players.
2018-07-30 21:33:16 -07:00