Commit Graph

218 Commits

Author SHA1 Message Date
MistakeNot4892 37717fe7b2 Tachikoma tweaks. (#7988)
* Fixes erroneous copypaste in tachikoma join string.

* Nerfs tachikoma speed.

* Nerfs tachikoma armour.

* Added wirecutters and welder to recon platform kit.

* Swaps the explo platform chainsaw to emag item, gives them a machete instead.

* Prevents ghosts from mousedropping crates onto platforms.
2021-03-19 05:04:00 -04:00
Unknown 213d383c09 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-03-11 10:01:39 -05:00
FenodyreeAv efd319c851 Adds a modular armour version of the explorer suit and adds sprites to specialist armour 2021-03-07 15:37:53 -05:00
Unknown 973f183e37 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 2021-02-28 16:16:11 -05:00
Unknown e6db218e71 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-02-28 14:29:46 -05:00
MistakeNot4892 3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
Aronai Sieyes eee1ce7c04 Don't call attack_self programatically on this 2021-02-17 09:57:31 -05:00
Mechoid 02ffbbe79b Gadgets & Gizmos 2021-01-15 01:56:01 -05:00
Mechoid 40a4602d4b Adds a Whip. 2020-12-27 20:56:54 -05:00
Novacat 612f187ef6 Update twohanded.dm 2020-11-19 19:45:26 -05:00
Mechoid a62f766bb5 Kaleidoscope 2: The Retabbening 2020-11-19 13:06:10 -05:00
Meghan-Rossi 3634234788 Fix most borosilicate shards disappearing instantly after being made (#7726)
*Fixed borosilicate glass not producing shards in most situations.
2020-10-17 06:06:15 -04:00
ShadowLarkens 3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Rykka d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Cerebulon 8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
KasparoVy 1a5bdf4e98 Refactors Ore Eating to Allow the Consumption of Material Sheets
Refactors ore eating to facilitate the ethical consumption of refined materials, easily obtainable on station. Suggested by the kobolds.

Also fixes the material name of Plastitanium glass throughout the codebase.
2020-05-22 03:55:04 -04:00
Aronai Sieyes 09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Aronai Sieyes 6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Aronai Sieyes 88154f0374 Adds rutile (titanium ore) and other materials 2020-04-20 12:07:45 -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 8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Aronai Sieyes f475ecbdc6 Replace a bunch of VOREStation edits that can be sent to Polaris 2020-02-29 19:45:58 -05:00
Atermonera 11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Arokha Sieyes 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Mechoid ec5e851399 Xenoflora expansion take2 2020-01-08 13:46:25 -05:00
lbnesquik 562df07602 Move the lance sprite to weapons_vr.dmi. 2019-12-26 07:25:49 +01:00
lbnesquik eace084579 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-26 07:25:05 +01:00
lbnesquik ae398259ea Introduce more taur clothes.
- Add medieval style barding for centaurs.
- Add full body options for wolf taurs. (Fat sprites slightly break this)
- Cloak for Drakes
- Botany Apron should work for the majority of taurs and not weirdly cut at the middle.
- WIP lance
2019-12-25 20:40:21 +01:00
Unknown 9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
lolman360 31995aba35 Sharpening kits. (#6501)
* one

* rtwo

* image

* Update material_weapons.dm
2019-11-04 21:44:30 -05:00
Heroman3003 a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Atermonera 524520cb8b Shards only do damage if you hit things with them (#6478) 2019-10-20 17:55:27 -04:00
Novacat ffb66290db Merge pull request #5726 from VOREStation/upstream-merge-6418
[MIRROR] Shards Do Damage to Holder
2019-08-28 01:54:38 -04:00
Atermonera 2162dbfa0b Merge pull request #6418 from MisterLayne/glass_shard_self_harm
Shards Do Damage to Holder
2019-08-28 01:25:47 -04:00
Atermonera bf558eacfd Merge pull request #6417 from MisterLayne/conductivity_fix
Non-conductive Things Do Not Conduct
2019-08-28 01:24:24 -04:00
Mechoid 595cdeb7b5 THIS PR IS 7+ DAYS OLD, SEE #6203 . Energy-Swords and Changeling Melee Weapons Can Deflect Projectiles (#6215)
* MakeMeleeGreatAgain

* Where is melee defined?!
2019-06-18 05:51:23 -04:00
Heroman 703c27da7e Refactors shadekin 2019-04-28 15:10:06 +10:00
Neerti fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Neerti 30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Neerti 86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Atermonera eb1bbac042 Merge pull request #5656 from lbnesquik/Kates-AshTray-Fix
Fix plastic ashtrays only holding one butt. Now they hold 4 butts.
2018-10-13 17:17:27 -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
Anewbe 6e4a77f010 Boot knives fit in boots 2018-09-19 15:42:08 -05:00
Anewbe eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -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
Novacat 5addac95ed Pathfinder Update (#3777)
* Pathfinder Update

- Implimented Pathfinder, Command Exploration role
- Added Deluxe Machete for Pathfinders (just a cosmetic reskin)
- Added Pathfinder's office, between expedition prep and breifing
- Expanded size of expedition shuttle
- Ported Pilot and Explorer voidsuit from Baystation
- Restored the old air tank on the expedition shuttle
- Added a couple starter shelter capsules to exploration
- The expedition shuttle now has toggled blast doors to cover the windows
- Increases pay of pilots, SARs, and Explorers
- Adds box of volunteer headsets to the Pathfinder's locker

* Polaris Merge Compatability

* Forgot some things

* Moves PF from command to science

* Requested changes Part 1

* Travis and Access Fix

* Requested changes Part 2

* Resetting Maps Part 1

* Resetting Maps Part 2

* Replaces PF office airlock

* Requested Changes Part 3

* Remove gateway access

* Changes Locker/Door Access Req

* Removes blast doors

* Pilot voidsuit crate cost tweak
2018-05-31 16:57:40 -04:00
Arokha Sieyes 6b42df0685 Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
# Conflicts:
#	code/__defines/misc.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/computer3/computers/card.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/structures/signs.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/client/client defines.dm
#	code/modules/client/client procs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/events/radiation_storm.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_dispenser.dm
#	config/example/config.txt
#	html/changelogs/.all_changelog.yml
#	interface/skin.dmf
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
2018-05-25 13:23:47 -04:00
Unknown 2c1ad0076f Requested Fixes 2018-05-22 12:49:41 -04:00
Tad Hardesty 927050ce44 Fix various syntactic problems 2018-05-16 21:43:18 -07:00
Cameron653 e47fe15fbf Fixes a comment that caused developers to scratch their heads.
Glass has a hardness of 30 https://github.com/PolarisSS13/Polaris/blob/master/code/modules/materials/materials.dm#L433

Thrown_force_divisor multiplies by 1.5. 
WHY THE HELL IS THIS A MULTIPLIER INSTEAD OF A DIVISOR ???? WHAT MADMAN NAMED THESE VARIABLES? https://github.com/PolarisSS13/Polaris/blob/master/code/game/objects/items/weapons/material/material_weapons.dm#L56

p.s: Marble spear does 50 damage per hit. may wanna nerf that. It's a 2 tile attack that does 50 damage. 
When thrown, marble spear does 39 damage, since it multiplies the blunt damage (26) by 1.5
2018-05-03 22:44:07 -04:00