Commit Graph

109 Commits

Author SHA1 Message Date
Aaron
ff94875b02 New mech and mech fixes!
Adds a new mech the "Scarab"! A fast scout mech with terrible armor and health and equipment slots, but it's fast! Ideal for enter a conflict, scouting, maybe taking a pot shot and and then BUGGERING off.
Bug fixes:
-Fixes Polecat armor to plasteel exploit and makes the polecat actually use up the armor.
-Fixes the Serenity eating entire stacks of plasteel and giving gygax armor plates when you try to get it back.
-Fixes the Phoron bore to HOPEFULLY show up in the mechfab in the server.
2020-01-20 19:51:44 -05:00
Aaron
ff9ec4943b New Mech "Scarab"! Plus a bunch of mech fixes
Adds a new mech the "Scarab"! A fast scout mech with terrible armor and health and equipment slots, but it's fast! Ideal for enter a conflict, scouting, maybe taking a pot shot and and then BUGGERING off.
Bug fixes:
-Fixes Polecat armor to plasteel exploit and makes the polecat actually use up the armor.
-Fixes the Serenity eating entire stacks of plasteel and giving gygax armor plates when you try to get it back.
-Fixes the Phoron bore to HOPEFULLY show up in the mechfab in the server.
2020-01-20 19:51:24 -05:00
Hawk_v3
f976948ce3 Merge remote-tracking branch 'upstream/master' 2019-11-07 19:54:10 +00:00
Anewbe
52ea82ae2c Merge pull request #6506 from Heroman3003/mech-runtime-roundstart-fix
Switches equipped mechs to use initialize instead of new
2019-10-30 21:00:21 -04:00
Hawk_v3
2cc8800ede Merge remote-tracking branch 'upstream/master' 2019-10-08 15:14:36 +01:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04: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
8654b6bdf4 Merge remote-tracking branch 'upstream/master' 2019-07-19 22:05:31 +01:00
Atermonera
9325f590ca Mining Expansion, the Diggening. 2019-07-13 03:48:38 -04:00
Hawk_v3
bc7ea8379a Merge remote-tracking branch 'upstream/master' 2019-07-02 17:54:29 +01:00
mistyLuminescence
e50b9d0cc0 Serenity (#6208)
* Serenity

* travis

* adminspawn

* I greatly appreciate all detailed and informative feedback provided. Per request, the Serenity is currently adminspawn-only; a new PR will be made in two weeks to add it to Robotics and resolve any issues encountered during the testing period.

* Comments out circuit for two-week testing period
2019-06-21 00:14:05 -04:00
Hawk_v3
50e2482613 Merge remote-tracking branch 'upstream/master' 2019-04-22 20:12:14 +01:00
Atermonera
b7e9934206 Precursotech Janus 2019-04-18 00:33:20 -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
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Spades
eb0e2ec1f5 Guns sounds refactor and improvements 2019-03-27 10:42:18 -04:00
Hawk_v3
b6988c5a09 Merge remote-tracking branch 'upstream/master' 2018-12-15 19:37:28 +00:00
Atermonera
5a6ae50b14 Merge pull request #5643 from lbnesquik/Kates-Mech-Tweaks
Mech noises update.
2018-12-01 00:36:05 -05:00
Hawk_v3
4e66b1f7c7 Initial merge fixes
Clean Compile, 0E, 0W
2018-10-03 20:08:55 +01:00
Hawk_v3
beb7579ed3 Vore Updates and merges 2018-10-03 18:25:39 +01:00
Mechoid
509addffdf Adds a whole bunch of Exosuit weapons and other miscellaneous parts. 2018-08-23 20:14:56 -07:00
Mechoid
6f909ce590 Mech Mini 'Revamp'. Will need playtesting. (#5480)
* Exosuits are now capable of holding more equipment, of specific types.

* Tweaks regarding feedback in staffside thread, other concerns.

* Tweak to be more consistent. Why did the Odysseus have two universals. Tweak to weapon restriction on Med - > Odyss

* Weapons only fit in universal combat slots.
2018-08-21 15:08:58 -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
Aronai Sieyes
7d3aec96fd Arranges lots of things into planes (#5072)
* Rearranges a billion things into planes

* Make cryotubes fancy

* Update Travis

* Fix hiding logic
2018-03-28 12:59:12 -07:00
Belsima
085f88cdc9 GORILLA - The Revival (#4957)
* GORILLA

* is this absolute

* less indentation

* Minor balance adjustments

* Mech update
2018-02-28 22:33:56 -06:00
Kelshark
92980edc93 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/game/jobs/job/science.dm
#	code/modules/mob/living/carbon/human/species/station/human_subspecies.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt
2017-10-29 18:14:56 -04:00
Kelshark
3ab70b7996 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt
#	vorestation.dme
2017-10-17 08:49:37 -04:00
killer653
3cd3054811 Fixes filter being used, which prevented compiling 2017-10-15 19:01:55 -04:00
Mechoid
77f0e7514c Combat exosuits can now actually punch through walls and girders again, based on their 'force'. Fixes some to_chat's. 2017-09-29 22:10:48 -07:00
Mechoid
b4a323ec38 Fixes Brain-Mechs, and a tangentially related MMI runtime. 2017-09-29 20:29:30 -07:00
Kelshark
a32459eb90 Gorillas back in bb 2016-12-28 17:29:25 -05:00
Zuhayr
f93ea6a78f Tweaks to previous commits.
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
2015-12-24 21:13:40 +10:30
PsiOmega
e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm
2015-08-21 20:27:48 +02:00
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
PsiOmegaDelta
0ba7643217 Updates files as necessary to adhere to the new standard. 2015-07-27 09:32:51 +02:00
Zuhayr
f096d5cabe Merge resolution. 2015-06-28 06:13:24 +09:30
Zuhayr
411987c68b Merge resolution with master. 2015-06-28 06:02:52 +09:30
Ravensdale
ba3d180db6 Remove posi-mmi-mechs
fix

actual removal
2015-06-26 12:37:37 -07:00
GinjaNinja32
de4f085057 code/game, excluding code/game/machinery and code/game/objects 2015-05-29 21:51:27 +01:00
Zuhayr
a9f936fe42 Added exosuit customisation kits to cargo. 2015-05-13 11:20:54 +09:30
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmega
a6a428af6a Mecha + misc. Destroy() because I had already begun. 2015-04-17 09:55:59 +02:00
=
601e6fb7ef Merged with dev. 2015-03-31 11:17:13 +10:30
PsiOmega
464d702d4b Mob refactoring.
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
2015-03-29 10:44:31 +02:00
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
mwerezak
cd81f0b706 Improves gun scope zooming 2015-02-14 22:12:16 -05:00
Zuhayr
78918e4795 Entirely removed the Honker mech, other refs to bananium, adamantine and mythril. 2014-06-08 00:52:20 +09:30
Chinsky
fd928d4b5f Cleaned the fuck out of smoke. 2013-11-05 02:57:23 +04:00
Segrain
77748f1116 Mecha weapons. 2013-10-12 14:41:24 +03:00