cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-30 20:14:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,468 Commits 5 Branches 0 Tags
7c492a3d17ec54cb5c0158979f9827a57cb15d53
Commit Graph

765 Commits

Author SHA1 Message Date
Hawk_v3
170d1e8423 Merge remote-tracking branch 'upstream/master' 2018-11-26 22:27:46 +00:00
Spades
0468b18e7a Merge pull request #4484 from VOREStation/permits-updates 
Updates permits, adds Ace's pistol
 2018-11-26 09:03:38 -05:00
Spades
c8b50f7a67 Merge pull request #4475 from Novacat/nova-weapons 
Weapons Tweaks and Sprites
 2018-11-26 09:02:55 -05:00
Spades
a542e23e4e dragor no 2018-11-25 20:32:40 -05:00
Unknown
19efdc84dc Improved Holdout Description 2018-11-25 17:33:04 -05:00
pontifexminimus2
5913203c0f Due to request of Ace. 2018-11-25 17:22:35 +01:00
pontifexminimus2
4c46defd4f Renaming Protector too. 2018-11-25 16:50:24 +01:00
pontifexminimus2
784e48b895 Holy shit I hate this. 2018-11-25 16:45:37 +01: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
Spades
0f2a17b3bc Fixes error, also slightly alphabetizes a file 
custom_boxes_vr.dm
 2018-11-09 20:16:30 -05:00
Spades
129a289052 Updates permits, adds Ace's pistol 
- Fixed some permit stuff.
- Removed expired permits and associated items.
- Added Ace's pistol plus a spare mag.
- Locked items to brig access, covering warden, HoS, and Captain, but
not roles like HoP. I think.
 2018-11-09 20:06:01 -05:00
Hawk_v3
c95810acfd Merge remote-tracking branch 'upstream/master' into updates 2018-11-06 00:58:48 +00:00
Unknown
97c5771625 8 Shots Phaser, 4 shots holdout 
- Also halves power usage for stun options on both the martin and the holdout
 2018-11-05 19:12:45 -05:00
Arokha Sieyes
d50e2d9deb Edit mapped in HoS armor 
It was edited on the map to have pretty incredible armor values, better than SWAT armor, even. Things like this shouldn't be edited in the dmm files. Hard to have oversight on things like that.
Moved the armor values to the code and out of the map, and adjusted them to be more reasonable after discussing with other admins.
 2018-11-04 22:51:32 -05:00
Unknown
b974aa763a Renames normal to lethal on phasers 2018-11-02 15:59:13 -04:00
Unknown
6d928db859 Sprite swap for low power/stun 
Red = High Power, Blue = Low Power, Yellow = Stun
 2018-11-02 12:54:51 -04:00
Unknown
f67de7bc84 Weapons Balance and Sprites 
- AEG now has 10 lethal shots
- Phase weapons bonus damage to animals removed
- Phase weapons now do real damage
- Charge cost bug fixed with phaser
- Overhauled sprite for holdout phaser
- Added Phaser Carbine, right now just a reskinned phaser
- One phaser carbine added to the Pathfinder's locker
 2018-11-02 12:31:22 -04:00
Hawk_v3
2cfaf95e78 Merge branch 'upMaster' into updates 2018-10-21 03:48:41 +01:00
Spades
c9a5499a70 Merge pull request #4426 from Heroman3003/awoo-refactor 
Replaces awoo with wolfgirl
 2018-10-20 08:56:14 -04:00
Heroman3003
1ea42e4558 Refactors Awoos into Wolfgirls 2018-10-20 12:35:32 +10:00
Hawk_v3
71b8f6582d Merge remote-tracking branch 'upstream/master' 2018-10-16 22:10:17 +01:00
Aronai Sieyes
8c764d487d Merge pull request #4340 from Novacat/nova-pathfinder 
Exploration Fixes for 09-27-2018 Sync
 2018-10-16 12:27:52 -04:00
Hawk_v3
10ca5bb70f Merge remote-tracking branch 'upstream/master' 2018-10-14 17:09:41 +01:00
Unknown
50f0102186 Exploration Fixes for 09-27-2018 Sync 
- Removes redundant station_vr file
- Reverts exploration suit cyclers to polaris cyclers
- Adds a pilot suit cycler to exploration
- Applies a functioning fix for holdout phasers
- Slightly buffs up the holdout phaser to be 50% of expedition phaser, to keep size-effectiveness scaling
- Removes head access from expedition shuttle control console
- Removes Pilot Blue/Old Exploration from polaris cyclers (they are still WIP on polaris end)
 2018-10-09 13:23:14 -04:00
luke vale
91233f423f Adds in code for hooded jackets, tested and works perfectly fine. 2018-10-08 16:52:34 -05:00
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
Hawk_v3
c931ceaa1f Merge remote-tracking branch 'upstream/master' 2018-10-07 23:07:09 +01:00
Izac Joof Forsgren
a028d889e9 Merge branch 'master' into master 2018-10-07 17:33:47 +02:00
luke vale
e5746c1bd6 Changes some fluff items names to not have a period, as well as swapping over the spawning name to their new one so it'll properly spawn 2018-10-06 20:26:13 -05: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
Hawk_v3
beb7579ed3 Vore Updates and merges 2018-10-03 18:25:39 +01: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
Repede
ba3584c965 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
 2018-08-17 19:13:15 -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
Repede
dac673181c Fluff stuff for Dushka and DeepIndigo 2018-07-14 15:59:54 -04:00
Repede
123050bcd0 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/game/jobs/job/civilian_chaplain.dm
#	code/modules/mob/language/station_vr.dm
 2018-07-08 11:38:06 -04:00
Unknown
b80b736e16 Fixes Imperial Laser too 2018-07-03 10:26:57 -04:00
Repede
d4bb48b2f6 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Resolved Conflicts:
#	code/game/machinery/cloning.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
 2018-06-29 09:58:53 -04:00
Mewchild
3164a98831 Shut up travis. Commenting Error 2018-06-26 02:43:43 -05:00