Commit Graph

431 Commits

Author SHA1 Message Date
Cheridan c67052b58d Merge pull request #5200 from PatchouliKnowledge/Phazons
Lots of mecha changes and additions.
2014-10-20 01:27:50 -05:00
phil235 9b9481d65c Changes many span classes.
Replaces for(mob in oviewers) show_message()  with visible_message() when possible.

Fixes the absolute pathing in Ninja code.

Fixes facehugger attack messages being bold red for third party (only the first leap message will stay bold red for third party, for better visibility)

Standardizes vomiting message

Fixes mech occupant not receiving any attack messages when the mech is attacked.
2014-10-18 16:00:38 +02:00
PatchouliKnowledge 433abe79d1 A less gimmicky way of removing the attack message from goliath plates 2014-10-17 23:43:20 +03:00
PatchouliKnowledge 8b9881a682 I accidentally the phasing 2014-10-11 22:37:37 +03:00
PatchouliKnowledge d31ed2583b Removes comments from combat.dm and phazon.dm 2014-10-11 21:42:55 +03:00
PatchouliKnowledge 6c649997e4 Fixes duplicate Ripley proc code, moves messages to switch() in Phazon damtype change code 2014-10-11 21:31:33 +03:00
PatchouliKnowledge 481135177c Lots of mecha changes and additions.
- Added constructible Phazon parts and circuits to R&D machines
- Added a Phazon construction path
- Nerfed the Phazon greatly
 > equip slots down to 3 from 4
 > step_in up to 2 from 1
 > toxin punch damage greatly nerfed (from ~80 tox damage to ~20 per hit)
 > research levels required increased (materials 7, bluespace 6, power 6, emp 6, data 5)
 > research levels from parts reduced
- Fluffed out the Phazon in general (sounds, descriptions)

- Grammar fixes to mecha construction process - added a bunch of missing periods and articles
- Changed Durand construction to require a super capacitor and phasic scanner instead of advanced ones

- Buffed the exosuit extinguisher (now has 1000 water instead of 200)
- Buffed the exosuit plasma generator (now consumes fuel at half the speed and doesn't burn through masses of plasma in minutes)
- Moved the cable layer tool from medical_tools.dm to tools.dm (why even)

- Buffed Ripley's default armour (brute from 20% to 40%, bomb protection 80% instead of none)
- All Ripley variants now have the same lights_power 7 (from Default Ripley's 6, and Death Ripley's 60 which basically created a fully lit square around it)
- The default Ripley can now be augmented with goliath armour plates, up to 70% brute protection (plates drop if Ripley is killed)
- Goliath-plated Ripleys get a different sprite and examine-description
2014-10-11 20:51:54 +03:00
Cheridan f5b5ead3ef Merge pull request #4516 from MrPerson/examinate_the_doctor
Change examine() from an atom verb to a mob verb
2014-10-05 23:37:34 -05:00
Cheridan 08be1b34eb Revert "Changes a few green crosses to blue on sprites that I missed last time" 2014-10-04 19:22:10 -05:00
MrPerson 651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
phil235 b00b41bbf9 Replacing clone damage descriptions by "cellular damage". 2014-09-25 19:11:31 +02:00
Cheridan 71fdb766fe Merge pull request #4921 from phil235/OddyStatFix
Sleeper and odysseus fixes
2014-09-25 08:30:51 -05:00
Swag McYolosteinen f9e17faca3 Merge pull request #4889 from Jordie0608/orwecouldpathplasmasheetsasfire
Repaths clown ore to bananium
2014-09-24 16:58:23 +02:00
phil235 04c430b275 fixing font color. 2014-09-21 18:40:18 +02:00
phil235 ea3608b219 Sleeper and mech sleeper now detect brain and clone damage (only a message, not giving actual numbers). Sleeper health bar no longer full and green when dead/unconscious patient. Sleeper and mech sleeper no longer give total health percentage once patient is dead (similar to health analyzer). Odysseus medical hud no longer shows an "ill" icon on people with beneficial/neutral viruses. 2014-09-21 18:28:12 +02:00
Jordie0608 40e0a52283 Repaths clown ore to bananium 2014-09-19 21:26:50 +10:00
Aranclanos f0d225ac81 When exiting an mech, your hud will only be toggled if you're human, avoiding runtimes. 2014-09-18 11:37:46 -03:00
Aranclanos 53f48fa599 Cleaned up the turf Entered() procs:
-Removed check for infrared beams. (it checked each time that anything moved)
-Removed 'movement_disabled' check, the verb is also completely removed.

For space Entered() turfs:
-Removed check for meteor
Now meteors and immovable rods will use the same proc to determinate their start and finish, while moving they'll check in which z level they are, deleting themselves if they leave it.
-Removed spawn() to move objects being pulled between z levels
Replaced the step() from mob pulling movement code and replaced them with Move()

For asteroid Entered turfs:
-Removed check for mining cyborgs, now it will be next to the janitor borg check to clean the floor.

Mecha code got a small clean, removing the Entered() calls from there.
2014-09-15 03:26:58 -03:00
Cheridan db177765eb Merge pull request #4736 from phil235/DrillMsgFix
fix for mob drilling message
2014-09-07 22:42:29 -05:00
phil235 3a12a4bfe8 fix for mob drilling message 2014-09-08 02:34:14 +02:00
Lo6a4evskiy 82f869c9a6 Updated to resolve conflicts 2014-09-06 13:34:43 +04:00
Miauw 78a9b0be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into say()
Conflicts:
	code/__HELPERS/game.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/requests_console.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/objects/items/devices/PDA/radio.dm
	code/game/objects/items/devices/aicard.dm
	code/modules/admin/admin_verbs.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/voice.dm
	code/modules/mob/living/carbon/brain/brain.dm
	code/modules/mob/living/carbon/human/whisper.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/say.dm
2014-08-31 13:40:16 +02:00
MrPerson a23dbe2357 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
Conflicts:
	code/game/objects/items/devices/radio/radio.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/events/ninja.dm
	code/modules/power/cell.dm
	code/modules/power/port_gen.dm
	code/modules/reagents/reagent_dispenser.dm
2014-08-29 04:21:15 -07:00
Firecage 6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
Firecage 9ea09fe63c Spanclasses for files in the Linda, mecha, Turfs folders 2014-08-23 10:48:10 +02:00
MrPerson d0c97aae72 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/game/gamemodes/cult/ritual.dm
	code/game/gamemodes/nuclear/pinpointer.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/status_display.dm
	code/game/objects/effects/decals/crayon.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/airlock_painter.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/storage/secure.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/mousetrap.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/slime/examine.dm
	code/modules/power/cable.dm
	code/modules/reagents/grenade_launcher.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/recycling/sortingmachinery.dm

Thanks Firecage, this is all your fault
2014-08-20 05:54:20 -07:00
Cheridan 148d16397b Advanced Shotshells
adds 3 new types of shotgun ammo. make them by crafting the special shell in RND, and then using table-crafting to make the unique ammo.dmi

meteorshot, made with compressed matter cartridges
pulse slugs, shotgun rounds with the properties of a laser weapon.
dragonsbreath rounds, area-of-effect flame weapons.
renames ammunition/bullets.dm to ammunition/ammo_casings.dm, which is more accurate

splits RND designs up into their own files
2014-08-14 12:15:10 -05:00
Aranclanos a81777c4b9 Merge pull request #4359 from Firecage/Mechafileabsolutes
Mecha files absolute paths
2014-08-09 16:31:57 -03:00
Cheridan 618c90aac4 Merge pull request #4329 from Justin1693/patch-1
Bugfix For Mechs
2014-08-09 11:31:46 -05:00
Miauw 8602795aec FUCKING RADIO CODE 2014-08-07 18:11:53 +02:00
Firecage 44560c4a0b Mergin tis all 2014-08-07 12:41:44 +02:00
Firecage 13aa0c5981 Absolute paths for mecha files 2014-08-07 12:10:14 +02:00
paprka 3b31436e43 conflict 2014-08-06 15:30:45 -07:00
paprka d41a469ff4 Merge branch 'master' of https://github.com/tgstation/-tg-station into goodbyedeadspace
Conflicts:
	code/game/mecha/mecha.dm
2014-08-06 15:22:56 -07:00
Miauw 6b42d39228 does more shit 2014-08-05 19:17:21 +02:00
Justin1693 c986fef890 Bugfix With Mechs (mecha.dm)
Added in a check to see if the mech a player is trying to enter has a health value greater than 0. This fixes a bug whereby if a player is entering a mech as it is destroyed, their mob gets deleted and the player loses connection to the server. Reconnecting to the server allows this player to rejoin the game, but as a new person.
2014-08-04 01:04:43 -07:00
Aranclanos ccae5781c5 added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines.
Added melee click cooldown for paper spam on cameras.
2014-08-03 22:14:56 -03:00
paprka 265b4db7d4 one more pass 2014-07-29 16:59:20 -07:00
paprka eea9ae50ad merging 2014-07-29 16:50:21 -07:00
Alex 128cb7d9c7 Merge pull request #4124 from MrPerson/qdel_mecha
Fixes some issues with mechs getting deleted
2014-07-25 09:25:55 +01:00
Kyle Franz 94bde48ac3 Expanding comments 2014-07-22 15:41:54 -07:00
Kyle Franz cb7cbc74e7 Cooldown on attacking a mech even if your weapon deflects 2014-07-22 15:38:04 -07:00
Kyle Franz 1e691d2b26 Fix #3821 Attacking mechas has no click cooldown 2014-07-22 15:27:00 -07:00
MrPerson 8cabe95aac Fixes some issues with mechs getting deleted
Mechs delete correctly, and delete their special looping iterator datums just for good measure. Also now sanity check them because now they can be null.

Fixes #4067 hopefully. This issue is impossible to repro alone and even then it's one-in-a-million, but I've removed a bunch of spawn()s that only served to create a window one can jump inside between the mech running the deletion proc and actually running Destroy() and setting loc = null. I've also added two safeguards to make sure it doesn't happen in the future. Can't enter a deleted mech and getting deleted kicks anyone inside out just to be sure.

Removed the super pointless obj/mecha/proc/destroy(). Even when this was written, it should have just been in Del()!
2014-07-10 03:37:15 -07:00
Cheridan 06edd41bab Merge pull request #3889 from Kelenius/OfCyborgsAndModules
Of cyborgs and modules
2014-06-20 15:03:15 -05:00
Cheridan 01a945b3d9 Merge pull request #3887 from Ikarrus/removeverb
Removes "Enter Exosuit" verb
2014-06-20 01:35:39 -05:00
Alex c72018cbd9 Merge pull request #3888 from Ikarrus/mechadrills
Mecha drills deal brute organ damage to mobs
2014-06-19 15:09:16 +01:00
Kelenius a8b7588c12 Merge branch 'master' of https://github.com/tgstation/-tg-station into Temp
Conflicts:
	code/game/objects/items/weapons/grenades/ghettobomb.dm
	code/game/objects/structures/door_assembly.dm
2014-06-19 02:27:10 +04:00
ikarrus df285ff7b3 Resolved conflicts:
code/modules/mob/mob.dm
2014-06-13 09:04:30 -06:00
Ikarrus 5e082609aa Update mecha.dm 2014-06-13 08:52:15 -06:00