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

178 Commits

Author SHA1 Message Date
Unknown
3aa0fdfda5 Removes conductive flags from VR stuff 2019-03-28 21:45:38 -04:00
Unknown
ad181e797a Conflict Resolution 
Also fixes a compiling error with previous PR
 2019-03-28 17:24:03 -04:00
Novacat
77db377d61 Merge pull request #4748 from Heroman3003/mlembulance 
Tempest's saddlebags now double as ambulance siren/light
 2019-03-28 16:39:37 -04:00
Unknown
03dcb65c01 Fixes most of the issues 2019-03-27 00:38:44 -04:00
Heroman3003
0171fa3faa Cleanup of Tempest saddlebag code 2019-02-23 06:37:57 +10:00
Heroman3003
b1c142eff0 Makes mlembulance slightly less quiet 2019-02-20 07:37:43 +10:00
Heroman3003
239a222a7f Improved Tempest ambulance sprites to better represent ambulance. 2019-02-05 06:25:31 +10:00
Heroman3003
f88452d2c9 Tempest's saddlebags now double as ambulance siren 2019-02-04 17:58:16 +10:00
lm40
d11c036733 fixed icon 2018-11-12 20:02:40 -05:00
lm40
79f92e4f20 added kenzie's hypospray 2018-11-12 19:33:34 -05:00
Heroman3003
1ea42e4558 Refactors Awoos into Wolfgirls 2018-10-20 12:35:32 +10: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
Spades
6919cca96d Merge pull request #4070 from Knightfall5/master 
Ashley's fluff item
 2018-08-15 18:36:28 -04:00
Cameron653
5fc76df183 Merge branch 'master' into ALRAUNE_STUFF 2018-07-23 20:08:30 -04:00
Knightfall5
aa5a02c51b Update custom_items_vr.dm 2018-07-23 02:16:30 -04:00
Arokha Sieyes
46f7b22838 Fix virgo implant stuff 2018-07-21 14:21:17 -04:00
Cameron653
7028511d64 Prevents sanitization of custom icon base. Removes a custom fluff item since Alraune are now in. 2018-06-17 20:00:10 -04:00
Cameron653
8219ababc5 Makes fruit growing code on the Alraune organ based instead of implant based. Organizes the list to make it in alphabetical order. 2018-06-17 15:04:58 -04:00
Cameron653
da4773ebdb Makes Alraune variable on only /human. Changes a few 0's to FALSE and a few 1's to TRUE. 2018-06-16 01:32:55 -04:00
Cameron653
864c4ca106 Gives Alraune the ability to select body shape. Gives Alraune the ability to select a fruit/vegetable to grow via an implant. Some code cleanup relating to custom body shape selection. Makes species name their defines instead of "name" Fixes a typo in custom_items where the reagent generator being selected was roiz instead of pumila. 2018-06-15 16:41:59 -04:00
Aronai Sieyes
884a4ec99c Merge pull request #3820 from Novacat/nova-pathfinder 
Pathfinder Fixes
 2018-06-11 06:04:42 -04:00
Unknown
f81760da5b Pathfinder Fixes 
- Adds missing icons for other species in the Explorer suit cycler
- Fixes slot issue with drop straps and metal necklaces
- Pathfinder's Office can now only be accessed by the Pathfinder
 2018-06-02 10:54:17 -04:00
ArgobargSoup
8111652e25 Update custom_items_vr.dm 2018-06-02 03:03:27 -07:00
Aronai Sieyes
86e413bf00 Merge pull request #3634 from VOREStation/aro-taur_suits_must_die 
Removes taur suits
 2018-05-08 19:09:29 -04:00
InterroLouis
dc299bdd3b Add files via upload 2018-05-07 20:24:32 -04:00
Arokha Sieyes
c4cbe31199 Removes taur suits 2018-05-04 22:16:17 -04:00
Arokha Sieyes
fb23176220 Adds a baby translocator for miners 2018-04-24 12:59:24 -04:00
Cameron653
b3efd60a72 Merge branch 'master' into SILENCEDMP5A5_FLUFF 2018-04-11 00:37:26 -04:00
Arokha Sieyes
44437da3c3 Fixes #3368 - Teleporting now often respects dropnom pref 2018-04-08 21:42:33 -04:00
Cameron653
c026f42676 Adds SilencedMP5A5's fluff items 
https://forum.vore-station.net/viewtopic.php?f=27&t=1302
 2018-04-08 01:03:07 -04:00
Arokha Sieyes
56fd510f3f Removes a bunch of my unused fluff stuff 2018-03-23 22:02:20 -04:00
Aronai Sieyes
c1c1a398c6 Merge pull request #3181 from VOREStation/Cameron653-patch-1 
Fixes a fluff item
 2018-03-05 18:36:08 -05:00
Cameron653
a3d380d09d Fixes a fluff item 2018-03-04 17:25:49 -05:00
Konabird
a5b1befc6d Fixes Rischi's egg implant to actually work 2018-03-04 14:37:20 -06:00
Arokha Sieyes
f04c58f202 VS: Rewrites basically all of how bellies work 
And cleans up a ton of stuff.
 2018-02-27 13:29:45 -05:00
Silver
8c3c0430f6 Correct Origin Tech Values 2018-02-10 22:29:46 -06:00
Silver
ab40c9d38c Added Preferred Change to Deactivation Text 2018-02-10 18:26:51 -06:00
Silver
ef4d87a352 AwooCosplayCrate 
Adds Wolfgirl Cosplay Crate to Supplypacks under Recreation.

Adds Wolfgirl Replica Sword and Autumn Shield.

Adds the above and three existing items to aforementioned crate.
 2018-02-08 12:57:18 -06:00
Arokha Sieyes
5cda1d36c1 VS: Translocator blocked by certain turfs 2018-01-30 19:23:36 -05:00
killer653
6d28ce7963 Adds two egg implants 
https://forum.vore-station.net/viewtopic.php?f=27&t=1222
https://forum.vore-station.net/viewtopic.php?f=27&t=1001
 2018-01-22 18:38:39 -05:00
Cyantime
84c3154b2b Merge branch 'master' into hypo 2018-01-20 01:39:16 -05:00
Leshana
436d48b337 Update VOREStation specific code to use merged in features. 
* Update our reagent_containers to use the new "prefill" feature instead of our own PolarisSS13/Polaris/pull/4583
* Fix missing VOREStation Edit comments.
* Prevent singularity from entering dorm areas.
 2018-01-19 18:15:47 -05:00
Cyantime
09eb4054a5 Removes hypospray/vr and vial/vr 2018-01-18 19:01:26 -05:00
Arokha Sieyes
dc0e602663 Knife path fix for VS trashpiles and a fluff item 2018-01-18 15:48:14 -05:00
blazerules
846bb26f28 Electrostaff sheath fix 
Added new held item sprites.
 2018-01-07 18:44:50 +02:00
blazerules
b8f77619f2 Electrostaff sheath fix 
For some reason changing it to box/fluff broke it. Can't... put my finger on why. But it works as a backpack so alls good.
 2018-01-06 13:03:31 +02:00
blazerules
77080534a6 Electrostaff Custom Item 
Please kill me I am bad at noticing small things.
 2018-01-03 11:08:25 +02:00
blazerules
43108a5dab Electrostaff Custom Item 
Fixed typos
 2018-01-03 10:57:31 +02:00
blazerules
07b0b071ce Electrostaff Custom Item 
Changes as asked for by Arokha
 2018-01-03 10:07:52 +02:00
blazerules
2d434c40d5 Electrostaff Custom Item 
This is the code for the stunstaff as was approved here

https://forum.vore-station.net/viewtopic.php?f=27&t=1204
 2018-01-03 09:28:43 +02:00