cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,289 Commits 5 Branches 0 Tags
c25bd646df1b6f52ea3ecab5f7718cb0403cea01
Commit Graph

398 Commits

Author SHA1 Message Date
Repede
e44e346352 Release Update 
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
 2020-04-16 21:07:33 -04:00
Unknown
5468301dc5 Ports Polaris 6992 and some Urist backpacks 
- Reenables Dual Wielding penalties on most heavy guns.
- Adds wielded sprites for all weapons with dual-wield penalties.
- Ports a ton of gun sprites from Urist McStation
- Removes mention of requires_two_hands in code since that is not used anymore.
- Adds some Urist mcstation backpacks (VS only)
 2020-04-13 10:40:24 -04:00
Unknown
323d5f838b Gun Refactors and Changes 
- The Protector is now a minature energy gun, it has 3 lethal, 6 standard stun, and no special stun shot anymore. It retains the alert level lock, there is a version without the lock.
- The energy net gun now gets 3 net shots, but loses its stun alternate fire. It also gets a new sprite from baystation.
- Refactors all Vorestation weapons in vore/fluffstuff to be in their appropriate directories.
- Removes all personalized custom weapons.
- KHI is no longer the manufacturer for the Protector, Net Gun, and AR Glasses. I wanted to make KHI a bit rarer, and their specialty mainly ultra high tech equipment.
- Refactors Expedition Phasers. No practical change, but now there are unlocked versions of all three phaser variants.
 2020-04-11 19:39:49 -04:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
Unknown
9f2d3f522d Ports Sniper Rifle QOL from Polaris 2020-03-29 21:36:27 -04:00
SplinterGP
07e4d28fb7 Balances and finishes scattershot stuff 2020-03-24 20:45:39 -03:00
SplinterGP
3814aa8f82 (update) scattershot 2020-03-24 20:29:29 -03:00
Mechoid
487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -04:00
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
RadiantFlash7
faf6e95ce3 Revert "Revert "Major map change+misc changes"" 
This reverts commit f0d4f38bf1.
 2020-01-12 01:19:47 -05:00
RadiantFlash7
f0d4f38bf1 Revert "Major map change+misc changes" 
This reverts commit fd22b5ca87.
 2020-01-12 01:16:31 -05:00
RadiantFlash7
fd22b5ca87 Major map change+misc changes 
Moves holodeck next to AI core,
expands botany and kitchen, adds fishfarm
Adds photocopiers and pappershredders about.
Fixes some bad cameras,
adds detective pistol back in, Why wasn't it there prior?
Adds ballestics back in.
 2020-01-11 18:41:51 -05:00
Hawk_v3
bc7ea8379a Merge remote-tracking branch 'upstream/master' 2019-07-02 17:54:29 +01:00
ElectricB1ue
d9ebf54db0 Adds two new alternate sprites for the detective's revolver. (#6230) 
* Adds the sprites

* This should do things.
 2019-06-28 21:23:42 -04: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
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Spades
a184e67c93 Changes (R&D made) Saber SMG to Advanced SMG 2019-03-28 18:22:23 -04:00
Novacat
a98ac52678 Merge pull request #4750 from VOREStation/upstream-merge-5886 
[MIRROR] Introduces caseless ammo, and a caseless rifle
 2019-03-28 16:40:13 -04:00
Novacat
a4919caba2 Merge pull request #4719 from VOREStation/upstream-merge-5636 
[MIRROR] [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work
 2019-03-28 14:52:51 -04:00
Novacat
15dac0304f Merge pull request #4724 from VOREStation/upstream-merge-5877 
[MIRROR] Unfucks Vintage Rifle
 2019-03-28 14:42:43 -04:00
Novacat
741931aa31 Merge pull request #4723 from VOREStation/upstream-merge-5906 
[MIRROR] Gives the auto shotgun a new sprite
 2019-03-28 14:42:10 -04:00
Neerti
3256202407 [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work 2019-03-27 22:02:07 -04:00
Novacat
1e5b351f43 Merge pull request #4711 from VOREStation/upstream-merge-5875 
[MIRROR] Tommygun now Tommy Gun
 2019-03-27 20:45:46 -04:00
Spades
eb0e2ec1f5 Guns sounds refactor and improvements 2019-03-27 10:42:18 -04:00
Spades
41e8615c4e Introduces caseless ammo, and a caseless rifle 2019-02-07 00:35:27 -05:00
Spades
d667a8ac62 Unfucks Vintage Rifle (#5877) 
* Unfucks Vintage Rifle

I'm going to slap whoever copypasted this blindly.

Also this really shouldn't be 7.62/.308 but hurr durr out of scope
¯\_(ツ)_/¯

* Apparently I'm going crazy and the icon was fine

* Ammo naming consistency
 2019-01-27 16:05:15 -05:00
Anewbe
15c62c99d1 Gives the auto shotgun a new sprite 2019-01-27 15:59:52 -05:00
Spades
b86d6dab13 Tommygun now Tommy Gun (#5875) 
* Tommygun now Tommy Gun

https://github.com/PolarisSS13/Polaris/pull/5837

* Corrects sprite names

I figure this can stay as it is.
 2019-01-22 23:22:23 -05:00
Hawk_v3
b6988c5a09 Merge remote-tracking branch 'upstream/master' 2018-12-15 19:37:28 +00:00
Unknown
64fd3a11a6 Replaces Ace's ammo with HP 
Since 9mm has hollow point now.
 2018-12-12 21:53:24 -05:00
Hawk_v3
170d1e8423 Merge remote-tracking branch 'upstream/master' 2018-11-26 22:27:46 +00: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
901ab67301 Switch Jackhammer to Eject 
Attempt fix for Cycle Shells not working right for... Some reason.
 2018-10-21 02:56:52 +01:00
Hawk_v3
a5033292b5 Merge remote-tracking branch 'upstream/master' into update 2018-10-04 22:01:57 +01:00
Anewbe
741d6fbea5 Shotgun cycling animation framework 2018-10-03 14:30:56 -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
Anewbe
17a5010f44 Signal pistol can be reloaded (#5566) 2018-09-16 17:23:39 -07:00
Anewbe
ee48151135 Adds smart magazine, magazine functionality 2018-08-21 17:10:40 -05:00
Repede
1b5cb2bafa Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 2018-07-17 20:30:33 -04:00
Kates
fd0bfab228 Saber fix. (#5384) 
* Saber fix.

* Saber fix 2: Electric boogaloo

* parenthèse

* "And another one"

* Actually fixes the indentation

* Balance revert
 2018-07-11 00:49:32 -04:00
Kates
535cca9d0e Saber fix. (#5384) 
* Saber fix.

* Saber fix 2: Electric boogaloo

* parenthèse

* "And another one"

* Actually fixes the indentation

* Balance revert
 2018-07-10 23:49:11 -05:00
Repede
cbea7f7c1a Nerfs blueshields more, fixes for jackhammer drums. 2018-07-02 11:21:37 -04:00
Repede
d7124a22cc Jackhammer can only hold 4 rounds instead of 10, sprites changed to reflect that. 2018-07-01 22:16:46 -04:00
Hawk_v3
ee27b03c01 Tyops will be the death of us all. 
I missed a T for Topmounted
 2018-07-01 21:27:35 +01:00
Hawk_v3
5605a87683 Wrapping up the Jackhammer 
Name change possible, but here. All match and are ready.
 2018-06-30 02:42:31 +01:00
Hawk_v3
b922664afa Forgot to set a name from placeholder. 
Whoops.
 2018-06-29 15:50:44 +01:00
Hawk_v3
9a38e88b9f Blueshield updates. New shotgun. 
Semiauto revolver shotgun for Blueshield and Warden. Sprites are placeholder.

Blueshield spawn gear boxes for weapon choice now.
 2018-06-29 15:03:01 +01:00
Repede
7628d85140 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2018-05-23 00:13:07 -04:00