izac112
4088f40cc9
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-08-24 18:27:07 +02:00
VerySoft
ab74b5e5b5
Giant bow
...
It's a giant bow, you can equip it on your head or on your ear
I made this mostly as a fluff item for me, because of my character's ears, but I included a public version that anyone can use!
2023-07-15 14:43:02 -04:00
izac112
ff7df50a7e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-06-21 19:03:35 +02:00
Killian
b238b3e560
loadout overhaul pt1
...
various overhauls to loadout menus
2023-06-13 20:31:03 +01:00
izac112
f61e9a6a39
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-01-29 21:52:44 +01:00
Detective-Google
cce8ddc020
buh
2023-01-04 08:32:46 -06:00
Detective-Google
5858507b44
adds halos
2023-01-01 08:24:37 -06:00
izac112
261609b060
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-11-07 12:32:36 +01:00
Heroman
dbe9387f5f
Renames Engineer, new alt-titles for Stellar Delight
2021-11-02 19:56:49 +10:00
izac112
a274077bfa
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-10-28 21:04:37 +02:00
klaasjared
56f4ab1b4c
Base Commit
2021-10-27 16:18:30 -04:00
izac112
84b075457b
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-09-29 23:09:10 +02:00
Ghost Actual and GitHub
0085a5bd10
Adds more clothing from Polaris and various sources ( #11546 )
...
* Base Commit
* Secondary Commit
* Small Addition
* Small Fix
* Yet another Commit
* small fix
* Small Fix
* Small Addition
* More Commit
* I don't know how to stop
* ushanka
* Small Fix
* *aaaaaaa*
* another add-on
* Small Fix
* Revert "Small Fix"
This reverts commit e674b81a0ddee893c6aa2dcdb92040040677351a.
* Conflict Fixes
* Revert "Conflict Fixes"
This reverts commit 1af644bdcab78018aa73525125b32e522d08db41.
* Conflict Fix 2
2021-09-27 14:31:10 -04:00
izac112
f3c88225ce
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-08-29 10:22:30 +02:00
Ghost Actual and GitHub
4bb386e166
Expanding Clothing Options ( #11466 )
...
* Base Commit
* Second Commit
* Third Commit
* Fourth Commit
* Fifth Commit
* Sixth Commit
* Seventh Commit
* Final (?) Commit
* Small Fix
* Small Fix
* Merge Fix
* Small Fix
* Additional Goods
* Small Fix
2021-08-26 11:43:44 -04:00
izac112
4e14241cb8
Voreupdate
2021-07-21 15:16:48 +02:00
Aronai Sieyes
34982728cb
Add 'as anything' to various for loops
2021-07-20 12:39:59 -04:00
izac112
9c6581fe6c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-03-11 17:36:42 +01:00
Atermonera and VirgoBot
a8409a3e1e
Yet another clothing PR
2021-03-10 14:30:44 -05:00
izac112
edd05b01ac
Merge branch 'release' of https://github.com/VOREStation/VOREStation into Voreupdate
2021-02-13 16:59:09 +01:00
Novacat and GitHub
3d1ec8ce42
Merge pull request #9540 from VOREStation/upstream-merge-7810
...
[MIRROR] Excised Errant Bay Military Lore
2021-02-13 00:50:25 -05:00
Schnayy and VirgoBot
92448560bb
Medical Soft/Field Cap
2021-02-12 15:04:06 -05:00
Cerebulon and VirgoBot
4fc2884f9f
Excised Errant Bay Military Lore ( #7810 )
...
* Filth + Graffiti Fixes
* Excised Bad Lore
* Update filth.dm
why was this here oops i was on master
2021-01-01 00:40:56 -05:00
izac112
5d64303087
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-11-17 16:26:30 +01:00
Schnayy and VirgoBot
8f9edf0e57
5 new clothes & 1 headdress ( #7733 )
2020-10-17 06:15:54 -04:00
izac112
03f0165bd3
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-29 05:56:00 +02:00
Atermonera and VirgoBot
f612958f0c
Merge pull request #7603 from Greenjoe12345/customloadout
...
adds the ability to give loadout items a custom name/description
2020-09-04 22:31:18 -04:00
izac112
50834e4a7b
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-02 23:52:01 +02:00
Novacat and GitHub
8e79488e0c
Update loadout_head.dm
2020-07-31 16:47:36 -04:00
Schnayy and VirgoBot
f9c3cf616e
Clothes, clothes, clothes!
2020-07-31 04:02:49 -04:00
izac112
e807b80281
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-05-27 20:10:55 +02:00
Aronai Sieyes
1bd327ce1e
Merge upstream PR
2020-05-21 15:48:02 -04:00
Novacat and VirgoBot
872bc17937
Updates Solgov/Sifguard uniforms
2020-05-21 14:21:19 -04:00
Killian
8d2ec5f7fa
loadout comments, improved warden/hos access modification
2020-03-17 15:44:23 +00:00
Killian
8b9f5e949a
security pilot basics
2020-03-17 15:11:28 +00:00
Repede
e4dd365fe1
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# code/_helpers/unsorted.dm
# code/controllers/subsystems/mapping_vr.dm
# code/datums/datum.dm
# code/datums/datumvars.dm
# code/datums/supplypacks/voidsuits.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/defib.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/world.dm
# code/modules/client/preference_setup/loadout/loadout_accessories.dm
# code/modules/client/preference_setup/loadout/loadout_eyes.dm
# code/modules/client/preference_setup/loadout/loadout_head.dm
# code/modules/client/preference_setup/loadout/loadout_suit.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/food/food/snacks.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/reagents/Chemistry-Recipes.dm
# code/world.dm
# config/custom_items.txt
# config/example/config.txt
# config/example/game_options.txt
# icons/mob/robots.dmi
# icons/obj/mining.dmi
# maps/submaps/surface_submaps/wilderness/wilderness.dm
# vorestation.dme
2019-04-07 19:40:12 -04:00
mistyLuminescence and VirgoBot
26ead98d6f
Loadout item role tweaks ( #5998 )
...
* Loadout ItemRoles tweak
2019-03-30 04:10:16 -04:00
Spades and GitHub
14fad52791
Merge branch 'master' into upstream-merge-5744
2019-02-23 11:51:40 -05:00
Cerebulon and VirgoBot
0be6662dc5
Adds 12 new futuristic loadout clothing items + colour variants
2018-12-06 16:17:20 -05:00
Atermonera and VirgoBot
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
Hawk_v3
eac48b5283
Merge remote-tracking branch 'upstream/master'
2018-10-24 22:07:16 +01:00
Atermonera and VirgoBot
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
Hawk_v3
10ca5bb70f
Merge remote-tracking branch 'upstream/master'
2018-10-14 17:09:41 +01:00
Atermonera and VirgoBot
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
Hawk_v3
beb7579ed3
Vore Updates and merges
2018-10-03 18:25:39 +01: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
Dwaggy
6a8ac4c3d4
Blueshield update/oversight
...
So..blueshield in loadout wise is a mix of command and security gear.
So..i've (finally) added Blueshield Guard to anything that was restricted to either "security officer", or to the 'entire list of command staff'.
this allows BSG's to take holsters, Sec huds, and the PMC coats and all that, along with coats that are usually in sec/command only for loadout choices..
What this doesn't mean is you can take the hat that only the CD or HoS has. those are still locked. I specifically looked for the two above criteria for access restrictions.
This is something that was long due and forgotten about in the midst of everything else.
2018-09-25 01:23:52 +01:00
Neerti and Anewbe
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
killer653
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
Belsima
0a76047cef
Loadout adjustments.
2017-12-02 08:59:46 -05:00
izac112