cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,722 Commits 10 Branches 0 Tags
ec3fb80f97c9e11188520e1ce55c7399b49c75a8
Commit Graph

445 Commits

Author SHA1 Message Date
Unknown
b237af9eab Rebalances VR Jumpsuits 
Virgo-specific jumpsuits (KHI and Star Trek) available in loadout are not supposed to have protection bonuses over the non-virgo ones.
 2018-10-08 17:41:07 -04:00
Unknown
5d7a974679 Reverts Phaser Nerf 2018-10-05 16:56:16 -04:00
Unknown
af4afc3e32 Fixes bug with holdout phasers 2018-10-05 02:04:30 -04:00
Unknown
e20f05e188 Expedition Balance Tweaks 
- Removes hostile mobs from V4 Beach
- Adds Giant Snakes and Giant spiders in generic V4 Cave spawners
- Reduced respawn rates to cut down on incidences of 'deathclaw swarms'
- Giant Snakes and Deathclaws have reduced overall spawn rates, Giant Spiders and Frogs will generally be more common.
- Replaced Ion hivebots with Ion Spiders
- Reduced expedition phaser to 5 shots
 2018-10-04 21:55:27 -04:00
Spades
718a96db61 Merge branch 'master' into MC-Medals 2018-10-01 09:23:19 -04:00
Spades
c6acdd5fe9 Merge pull request #4234 from Novacat/nova-heterochromia 
Tactical Kittens
 2018-10-01 08:49:19 -04:00
Unknown
dbb362820f Changes to use spawner grenade 2018-09-27 18:40:12 -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
f61e26d197 Fixes error. Shuts Travis up. 2018-09-12 19:09:51 -05:00
Mewchild
135470adc5 Medal Whitelists from abduction event 2018-09-12 18:00:21 -05: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
Unknown
b80b736e16 Fixes Imperial Laser too 2018-07-03 10:26:57 -04:00
Mewchild
3164a98831 Shut up travis. Commenting Error 2018-06-26 02:43:43 -05:00
Mewchild
26753c4330 Seb still has a permit. Misread. 2018-06-26 00:45:03 -05:00
Mewchild
f4ce27804c Comments out a bunch of expired permits and associated weapons 2018-06-25 23:52:25 -05: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
088b4d27af Merge pull request #3859 from Mewchild/MC-Fluff 
Vietsi Fluff Items
 2018-06-15 09:00:26 -04:00
Mewchild
7960499bd2 Vietsi Fluff Items 2018-06-11 12:00:27 -05:00
Aronai Sieyes
44500587f9 Merge pull request #3846 from Nepoox/master 
Adds Annie's pullover (Fluff Item)
 2018-06-11 06:10:38 -04:00
Aronai Sieyes
884a4ec99c Merge pull request #3820 from Novacat/nova-pathfinder 
Pathfinder Fixes
 2018-06-11 06:04:42 -04:00
Nepoox
8ff967eeec Changed name and description 2018-06-09 23:19:57 +02:00
Nepoox
e1cbfac2bf Fluff Item 2018-06-09 02:50:41 +02: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
Unknown
994a81b6b6 Adds pumping sprite 2018-05-23 14:20:09 -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
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
HzDonut
980c9bea44 LeMat Fix 
Argh
 2018-04-23 09:28:33 -04:00
Aronai Sieyes
fb7ca15439 Merge pull request #3477 from Mewchild/MC-Zaozao 
Adds Zigfe's Fluff Item
 2018-04-18 13:58:28 -04:00
Verkister
03ab2fef08 Updates sickshot description. 
Also making it little more clear that the only way to get victims out of uncooperative or dead things is no longer live human exclusive.
 2018-04-16 10:48:25 +03:00
Mewchild
b08357a068 Got dang quotation mark 2018-04-15 17:22:21 -05:00
Mewchild
8b469c4ec7 Adds Zigfe's Fluff Item 2018-04-15 17:11:08 -05:00
HzDonut
700c902d14 Modified LeMat Fluff Weapon (#3337) 
* LeMat

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm
 2018-04-14 19:41:19 -04:00
Arokha Sieyes
e9009507d8 Remove Aronai custom bag 
Medical bags ARE blue now, I don't need a custom blue one, just the ID that came in it.
 2018-04-13 20:21:25 -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
1b447796de Moves to proper file 2018-04-08 21:05:47 -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
Verkister
dd454644d1 Fixed leg wraps 
When no species are in the existing allowed list, no species can wear the thing.
 2018-03-20 15:10:42 +02:00