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
79,499 Commits 10 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

173 Commits

Author SHA1 Message Date
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
Atermonera
f4fb9ac262 Merge pull request #6885 from TheFurryFeline/TFF-Message_Fixy_For_Snowballs_and_Kickstands 
[Feature Tweak] Message Fixy For Snowballs/Kickstands
 2020-03-25 18:47:34 -04:00
Atermonera
3454a5dd61 Merge pull request #6787 from VOREStation/pol-latchto 
Trains try to talk to nobody on init
 2020-03-05 15:13:22 -05: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
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update 
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
 2020-01-31 18:23:50 +01:00
Novacat
bd06a75f81 Update cargo_train.dm 2020-01-21 01:16:43 -05:00
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
TheFurryFeline
5b179a8035 Sec Cart Key Fixy 
Title. Fixes a downstream issue. This fixes  https://github.com/Yawn-Wider/YWPolarisVore/issues/465

Changelog Notes:

- Fixes broken key usage that, once taken out of the Security Cart, you can't put it back inside the vehicle.
 2020-01-19 13:05:44 -05:00
TheFurryFeline
cf82af67d6 Comments. 2020-01-19 12:56:31 -05:00
TheFurryFeline
3ae2e4e429 Sec Cart Key Fixy 
Title, resolves #465.
 2020-01-19 12:37:55 -05:00
Hawk_v3
0f3c802427 Merge remote-tracking branch 'upstream/master' 2019-08-22 21:32:01 +01:00
Michiyamenotehifunana
81c56fefd8 Makes Cargo Tugs Great Again (and a minor tweak) 2019-08-16 12:37:08 +08:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01:00
Andrew
e4deaa6478 Combat Mechs Can Punch More Things (#6303) 
* Combat Mechs Can Punch More Things

Removes the var to check for the 5 things it can attack, instead it can punch anything (but not everything will take damage).

Gives punching objects a check so you don't accidently smash something without meaning to.

Gives closets and canisters a proc to take_damage so they'll actually get smashed by the mechs.

* Take_Damage Boogaloo

* More take_damage Stuff

Adds click delay on attacking barriers.
Proper noises when attacking material doors and barricades.

More stuff can be broken by mech punch and simple mobs.

* Adds changelong

* usr to user
 2019-07-24 17:00:24 -04:00
Hawk_v3
4668b23fea Merge remote-tracking branch 'upstream/master' 2019-07-10 01:50:50 +01:00
Heroman3003
6b55b63b0b Fixes ghost riders (#6252) 
* Fixes ghost riders

* Wider usage permissions for bikes
 2019-07-07 19:41:22 -04:00
Hawk_v3
bc7ea8379a Merge remote-tracking branch 'upstream/master' 2019-07-02 17:54:29 +01:00
Atermonera
3d31a77514 Multi-Tile Objects, Multi-Tile Hovershuttle 2019-07-01 20:43:53 -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
91a5203e32 Adds New PoI Features + Bonus PoI 2019-03-27 12:15:50 -04:00
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -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
Mechoid
18e91702d2 Keys now actually exist again. 2018-09-24 13:21:38 -07:00
Mechoid
0651206a51 Refactor cargo trains, they're just normal trains now. Adds the Quad, and re-enables/fixes the Space Bike! 2018-09-08 23:05:08 -07:00
Anewbe
eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00
Anewbe
c2794c571d Hopefully fixes some tool-conversion things 2018-08-03 15:13:29 -05:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
Repede
95a1fade33 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/clothing/gloves/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	config/example/motd.txt
#	icons/mob/human_face_or_vr.dmi
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme
 2018-04-20 09:03:58 -04:00
Arokha Sieyes
1273ca9ed4 Lazily implements taur riding 
It's pretty lazy. I'm sure someone with *effort* can touch it up.
 2018-04-12 15:10:17 -04:00
Repede
7c6aadd829 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/security.dm
#	code/game/area/Space Station 13 areas.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
 2018-03-23 20:25:18 -04:00
Leshana
a0de41f24f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15 
# Conflicts:
#	README.md
#	code/__defines/mobs.dm
#	code/__defines/subsystems.dm
#	code/_helpers/global_lists.dm
#	code/controllers/subsystems/garbage.dm
#	code/controllers/subsystems/overlays.dm
#	code/datums/datacore.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/weapons/id cards/station_ids.dm
#	code/game/objects/random/random.dm
#	code/game/turfs/simulated/floor.dm
#	code/game/turfs/simulated/floor_icon.dm
#	code/modules/awaymissions/gateway.dm
#	code/modules/client/preferences.dm
#	code/modules/ext_scripts/python.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/reagents/reagent_containers/glass.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-4.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2018-03-15 22:41:14 -04:00
Arokha Sieyes
73838e0a62 POLARIS: Revamp logging to be consistent 2018-03-13 18:20:58 -04:00
Repede
3366ab9769 Merge branch 'master' of https://github.com/VOREStation/VOREStation 2018-03-10 21:49:15 -05:00
Arokha Sieyes
46f4022852 VS: Consistent logging changes to match polaris commit 2018-03-10 17:18:09 -05:00
Arokha Sieyes
2c9bdf3ae4 POLARIS: Revamp logging to be consistent 2018-03-10 17:18:09 -05:00
Anewbe
33213ede2d Should be possible to replace cargo tug power cells 2018-03-04 14:31:44 -06:00
Kelshark
aea1eee615 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	config/custom_items.txt
 2018-02-21 22:19:24 -05:00
Leshana
5847319443 Update every initialize() proc to return an initialize hint. 
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
 2018-02-05 15:50:13 -05:00
Leshana
cef001bf2a Update every initialize() proc to return an initialize hint. 
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
 2018-02-03 01:00:57 -05:00
Kelshark
dc2a309c6a Smoll fixes to hueg ass update & merge 2018-01-24 21:04:12 -05:00
Kelshark
85f9061592 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/controllers/autotransfer.dm
#	code/datums/supplypacks/contraband.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme
 2018-01-24 19:52:12 -05:00
Arokha Sieyes
ff228754b3 Merge polaris sync 01 17 2018 
Planes, layers, human/update_icon()
 2018-01-17 17:56:51 -05:00
Neerti
96d3d361d0 Adds Boats, Ports /TG/ Buckling (#4527) 
* Adds Boats, Ports /TG/ Buckling

* Travis Appeasement

* Changelog
 2018-01-14 14:58:15 -06:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Neerti
2f7db506eb Adds Variable Click Delay 
Now certain weapons can strike faster or slower than usual. No weapons currently do this as this PR just lays the groundwork for that.
The click delay can also be modified with traits. The slime agility modifier makes attacks happen 25% sooner.
Adds debug test verb to display a weapon's DPS. It's really basic but should be sufficient for future force adjustments I might do in the future.
 2017-11-28 16:11:56 -05:00
Kelshark
f2f35697fb Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/datums/supplypacks/engineering.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	code/modules/vore/appearance/spider_taur_powers_vr.dm
#	code/modules/vore/resizing/resize_vr.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
 2017-08-18 08:14:12 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Neerti
99eb6f9404 Updates Tools 
Adds toolspeed var, which is a multiplier on how 'fast' the tool works.  0.5 means it goes twice as fast.
Adds usesound var, which determines what sound is used when a tool is being used.
Changes a lot of code to use those two vars instead.
Adds 'ayyy' tools, which are ported from /tg/'s abductor gamemode.  They're currently admin only but I might make them obtainable by xenoarch later.
Adds powertools, also from /tg/.  CE starts with them in a new toolbelt that spawns in their locker, ported from (you guessed it) /tg/.
Changes welder sprites to look nicer, ported yet again from /tg/.  Modified the blue welder slightly so it can be the electric welder sprite.
Adds various sounds from /tg/, for tools and welders.
 2017-08-03 04:49:23 -04:00