Commit Graph

11476 Commits

Author SHA1 Message Date
PatchouliKnowledge bb190861bf Goliath plates are now NOBLUDGEON 2014-10-18 00:03:01 +03: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
hornygranny 02d8cf4115 Merge pull request #4994 from paprka/miningainteasy
Mining rebalancing
2014-10-08 14:44:35 -07:00
Remie Richards e60dda5f0e Merge pull request #5106 from paprka/megacarps
Ports megacarps!!!
2014-10-08 22:16:22 +01:00
Remie Richards 23651b54f0 Merge pull request #5093 from paprka/medipens
Replaces a lot of inaprovaline syringes with medipens
2014-10-08 22:15:52 +01:00
Swag McYolosteinen 8589c8c874 Merge pull request #5120 from nivomi/turretsounds
Make spawned turrets use projectile-appropriate SFX
2014-10-08 20:57:21 +02:00
Remie Richards f5e54f1fa8 Merge pull request #5069 from phil235/WindoorDeconstruction
Adds windoor deconstruction & bug fixes
2014-10-08 10:27:45 +01:00
Remie Richards 7892359207 Merge pull request #5114 from hornygranny/fatstacks
can no longer stack resin structures
2014-10-08 10:21:49 +01:00
Remie Richards 8503bd632b Merge pull request #5103 from paprka/largebow
Readds large crossbow to protolathe
2014-10-08 10:18:51 +01:00
hornygranny c28dd40190 Merge pull request #5085 from paprka/WYATTSHIELDS
Adds telescopic riot shields
2014-10-07 21:13:03 -07:00
paprka f92e08d6a8 revert borg nerf 2014-10-07 20:34:28 -07:00
hornygranny b124e4ac41 Merge pull request #5119 from paprka/arcwelder
Welding tool sprite updates
2014-10-07 20:12:30 -07:00
hornygranny e223e4be1d Merge pull request #5112 from paprka/linghivemindshitomg
Lingspeak by default: easy edition
2014-10-07 20:06:33 -07:00
hornygranny bb3fe4ed52 Merge pull request #5077 from Steelpoint/DeathSquad
Deathsquad Armour Buff
2014-10-07 20:00:57 -07:00
hornygranny e611301f0f Merge pull request #5044 from Jordie0608/mapmergersoannoying
Fixes #4788 Resin walls on the abandoned mining station
2014-10-07 19:39:12 -07:00
MrPerson 3eccc3a709 Merge pull request #5091 from hornygranny/patch-1
bookcases no longer opaque
2014-10-07 14:31:01 -07:00
MrPerson 9797435df7 Merge pull request #5109 from paprka/telebatonstorage
Telebaton storage tweak
2014-10-07 14:25:56 -07:00
nobalm 0a1df18f25 Turret SFX and spawning changes
* Turrets now use the SFX associated with the weapon installed in them
* Turrets now have a default installed gun for when they are spawned
* fire_sound is now a property of all ammunition, not just energy ammo,
which should make future additions a lot simpler.
* Added some energy gun SFX handling to the giant switch statement at
the top of portable_turret.dm, because 'emagged' and 'lethal' are the
same thing and have to be handled weirdly.
* The upshot of all these changes is that every turret, constructed or
default, should make exactly the right noise, even if guns are added in
the future!
2014-10-07 16:44:51 -04:00
Cheridan f96b017149 Merge pull request #5097 from phil235/Msg1Fix
Fixing a lot of messages
2014-10-07 12:09:01 -05:00
Cheridan 0d0ae75102 Merge pull request #5108 from paprka/fixrobogrammar
Fixes grammar in robot.dm
2014-10-07 09:14:41 -05:00
Cheridan 598ef16d29 Merge pull request #5107 from tkdrg/borg_cult
Fixes restarted borgs hearing cult chat
2014-10-07 08:06:47 -05:00
Jordie0608 208b136996 Merge branch 'master' of https://github.com/tgstation/-tg-station into mapmergersoannoying
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
2014-10-07 21:56:06 +11:00
nobalm 6b556f5bed Fixed comment to reflect reality
Spent 2 hours working out how turrets create sounds before figuring out
that I'm an idiot.
2014-10-07 00:20:40 -04:00
nobalm 07aaad4896 Made turrets use projectile-appropriate SFX
Fixes #5030
2014-10-06 21:42:54 -04:00
paprka 1aff1d6c20 welding tool updates 2014-10-06 18:04:47 -07:00
Cheridan 84934d7456 fixing conflicts manually 2014-10-06 19:40:20 -05:00
Cheridan 66304667cf Merge branch 'dualswordstake3' of https://github.com/Aranclanos/-tg-station into Aranclanos-dualswordstake3
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/datums/uplink_item.dm
2014-10-06 19:27:14 -05:00
Remie Richards ea4e6f823c Merge pull request #5051 from paprka/rollingjsuit
Ports and improves jumpsuit rolling (casual adjusting) and noir detective set
2014-10-06 20:45:28 +01:00
Remie Richards 175d42061c Merge pull request #5088 from paprka/syndiesheet
Syndicate mother base/ship changes
2014-10-06 20:44:02 +01:00
paprka d6a8e0de09 code nitpicking (thanks remie) 2014-10-06 12:39:15 -07:00
Hornygranny 265069f2a7 did it properly 2014-10-06 11:07:07 -07:00
Hornygranny 185048bfd5 can no longer stack resin structures 2014-10-06 10:55:20 -07:00
Remie Richards 5b8b883cf0 Merge pull request #5050 from Incoming5643/spiders,man
Updates spiders to have full player functionality
2014-10-06 14:24:39 +01:00
Remie Richards b463c5a51f Merge pull request #5056 from Incoming5643/banthatshit
Adds step_x and step_y to the locked var list
2014-10-06 14:23:04 +01:00
Remie Richards 304a865ff7 Merge pull request #5089 from tkdrg/tubesarecool
Constructable transit tubes!
2014-10-06 14:22:22 +01:00
Remie Richards d82ac08d3c Merge pull request #5082 from Menshin/space_transitions_fixes
Space transitions/Away missions loading fixes
2014-10-06 14:14:01 +01:00
Remie Richards acf5bee200 Merge pull request #5092 from Cheridan/flashing
Flash Changes
2014-10-06 14:10:31 +01:00
paprka 683ad7286e lingspeak by default easy edition 2014-10-06 03:10:21 -07:00
paprka ed3385dbf3 pro-LGBT grammar 2014-10-06 02:54:12 -07:00
paprka 7c95d3b79b stupid compile errors 2014-10-06 00:45:22 -07:00
Steelpoint 37ba4cc912 BuffExplsoive&Bio 2014-10-06 15:17:08 +08:00
paprka 89795c95bf telebaton storage 2014-10-05 23:10:55 -07:00
paprka 2f960c8d89 lol 2014-10-05 22:25:53 -07: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
paprka b9a10b5a82 removes qdel on death 2014-10-05 17:49:15 -07:00
Cheridan df8dc6d119 Merge branch 'master' of https://github.com/tgstation/-tg-station into flashing 2014-10-05 19:24:49 -05:00