cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 12:50:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,835 Commits 9 Branches 26 Tags
690dc5cbecdafb59df8753bfae72176e3d2f8e54
Commit Graph

463 Commits

Author SHA1 Message Date
Novacat
e2afa12e38 Merge pull request #4841 from VOREStation/upstream-merge-5992 
[MIRROR] Departmental Turtlenecks
 2019-03-28 22:00:31 -04:00
Novacat
7768216c64 Merge pull request #4801 from VOREStation/upstream-merge-5974 
[MIRROR] Fixes departmental teshari cloaks and coats
 2019-03-28 21:09:51 -04:00
Neerti
15e3c04ca3 Nock masks, cowls & robes 2019-03-28 20:42:42 -04:00
elgeonmb
9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -04:00
Novacat
70d0a30868 Merge pull request #4635 from TheFurryFeline/master 
Holocollar Addition to Autolathe. Take 3
 2019-03-27 04:46:02 -04:00
Unknown
e298f07340 Replaces schedule_callback_in 
...Tested the bell, hopefully the xenochimera revives also work
 2019-03-27 01:33:54 -04:00
Atermonera
bf7686cd02 Merge pull request #5992 from mistyLuminescence/turtlenecks 
Departmental Turtlenecks
 2019-03-08 01:45:09 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Heroman3003
885fe76664 Fixes departmental teshari cloaks and coats (#5974) 
* Fixes departmental teshari clothes

Some missing vars, icons, misaligned qm undercoat, forgotten edits on some icon names.

* adjusted names and descriptions of departmental teshari cloaks

* Brought loadout entries to match existing ones.

* Puts RD on command tesh stuff WL, removes leftover comment

* Fixes a one-space typo in QM tesh cloak description.
 2019-02-24 17:15:30 -05: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
TheFurryFeline
2f6b30f297 Holocollar Materials 
Adds to Holocollar entry in the Autolathe, now requires Steel to make.
 2019-01-03 16:56:17 -05:00
Cerebulon
0be6662dc5 Adds 12 new futuristic loadout clothing items + colour variants 2018-12-06 16:17:20 -05:00
ArgobargSoup
552e040aad Update accessory_vr.dm 2018-11-12 20:54:44 -08:00
ArgobargSoup
be9950051f More elaborate collar tag functionality. 2018-11-12 19:42:12 -08:00
ArgobargSoup
91d1701130 Better bell cooldown, lengthens cooldown 2018-11-12 16:28:23 -08:00
ArgobargSoup
9dc9304204 Updates spam prevention variable name 2018-11-12 14:21:57 -08:00
ArgobargSoup
c375d939ca Update accessory_vr.dm 2018-11-12 03:56:37 -08:00
Atermonera
cab7997b27 Merge pull request #5686 from lbnesquik/Kates-Waistcoast 
Fixes all waistcoast being black when worn in the suit slot
 2018-10-23 15:00:56 -04:00
Aronai Sieyes
7c522fc0c4 Revert "Stethoscope vore shitpost" 2018-10-20 17:43:06 -04:00
lbnesquik
d8fd7ea6ac Update to listen to the reviews 2018-10-15 16:34:55 +02:00
lbnesquik
cb501e395d Please review 2018-10-13 09:28:27 +02:00
Kates
d1749b5981 Update accessory.dm 2018-10-09 07:29:44 +02:00
Kates
cb23bd95d4 Update accessory.dm 2018-10-09 07:29:02 +02:00
Kates
07bb2f0d1c Update accessory.dm 2018-10-06 09:57:38 +02:00
Kates
fa7ee8e015 Update accessory.dm 2018-10-06 09:39:45 +02:00
lbnesquik
db7fd37769 stethoscope shitpost. 
Add some small vore feature.
 2018-10-06 09:31:27 +02:00
Spades
718a96db61 Merge branch 'master' into MC-Medals 2018-10-01 09:23:19 -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
Mewchild
135470adc5 Medal Whitelists from abduction event 2018-09-12 18:00:21 -05:00
Anewbe
8c5562b4bc Fixes some bugs tangentially related to Vox code 2018-09-04 21:36:12 -05:00
Anewbe
08ddd217a8 Buffs the Vox 2018-08-31 22:58:25 -05: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
Anewbe
0c25bf04a0 Merge pull request #5375 from Mewchild/MC-Cloaks 
Adds non-head of staff department cloaks
 2018-07-02 20:32:14 -04:00
Mewchild
a8600832d8 Adds non-head of staff department cloaks 2018-06-27 10:24:31 -05:00
Aronai Sieyes
15acf6d79d Merge pull request #3780 from VOREStation/aro-exppermit 
Corrects explorer permit language
 2018-05-28 20:59:33 -04:00
Spades
310dcd4d0d Grammar! 2018-05-28 19:26:56 -04:00
Arokha Sieyes
0d434fadab Corrects explorer permit language 
Permit doesn't let them carry guns "on the surface", it lets them carry guns while exploring.
 2018-05-28 14:47:07 -04:00
Unknown
8572125d57 Fixes Machete Sheaths 
- Machete sheath now has proper slot assignment, so it can be worn again.
 2018-05-28 12:41: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
Atermonera
449a495b54 Merge pull request #5299 from Novacat/spriteadd 
Accessory Fixes
 2018-05-26 15:23:54 -07:00
Anewbe
d8f1069689 Adds a number of accessory related null checks 2018-05-25 12:29:33 -05:00
Arokha Sieyes
088eee3d96 SYNC: Compileability fixes 2018-05-25 13:29:30 -04:00
Unknown
39f9fbec1f Accessory Fixes 
- Only holsters with utility slot can be unsheathed/sheathed by clicking on the suit (to stop conflicts with webbing)
- Heavy Armor Plates no longer have a bugged/invisible icon
 2018-05-25 13:24:00 -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
Arokha Sieyes
80ffd86b0e Change accessories to use bitflags 
Allows accessories to 'block' multiple slots
 2018-05-22 15:55:22 -04:00
Unknown
db739dfc34 Did not work as well 2018-05-22 13:30:37 -04:00
Unknown
2c1ad0076f Requested Fixes 2018-05-22 12:49:41 -04:00
Unknown
ca131caa10 New Explorer Gear 
- Adds a new defensive exploration weapon intended for use by rear-line explorers, such as SARs and Pilots
- Ported Machete Sheath from Baystation, intended to be used with the machetes here
NOTE: I intended them to not be usable alongside holsters, but I am not sure how to go about this
- Explorer lockers will now come with a survival knife, machete, and machete sheath
 2018-05-22 11:27:48 -04:00
Leshana
e08cbef044 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04 
# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
 2018-04-06 15:40:06 -04:00