Commit Graph

3118 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
Cheridan
455b526cc1 Merge pull request #5318 from phil235/MsgFix2
More messages fixed
2014-10-19 21:39:06 -05:00
Cheridan
c5ed446f24 Merge pull request #5300 from phil235/DroneArrestFix
Fix for #5281
2014-10-19 18:54:33 -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
bb190861bf Goliath plates are now NOBLUDGEON 2014-10-18 00:03:01 +03:00
phil235
5159889153 Fixes secbot hunting, stunning and arresting maintenance drones that attack them. Secbot won't hunt them anymore, just like with silicons. Fix is done by adding a assess_threat() proc in simple_animal/drone that returns -10 (similar to silicons) 2014-10-17 18:04:33 +02:00
hornygranny
98d3ce08ed Merge pull request #5254 from paprka/underwearredux
Underwear updates
2014-10-17 07:55:34 -07:00
hornygranny
3224cdc151 Merge pull request #5182 from RemieRichards/XenoLeaping
Alien hunter leap ability
2014-10-17 07:36:57 -07:00
Cheridan
ccce2ee125 Merge pull request #5149 from RemieRichards/paprikaisbutthurt
Drones being picked up - Rebalance
2014-10-16 08:42:28 -05:00
Cheridan
368832093f Merge pull request #5185 from JJRcop/drone-tweaks
Drone Tweaks, Adjustments, Additions
2014-10-16 08:41:31 -05:00
paprka
c83592263b Revert removal of kinky underwears
w/e
2014-10-15 12:30:36 -07:00
Remie Richards
4256e2f264 Merge branch 'master' of https://github.com/tgstation/-tg-station into XenoLeaping
Conflicts:
	icons/mob/alien.dmi //Curse you WJ!
2014-10-15 15:08:12 +01:00
Aranclanos
d2d92dd35f Merge pull request #4873 from optimumtact/clicktyclackety
Adds click cooldown to clicking on mobs Fixes #4812 Take2
2014-10-15 11:03:02 -03:00
Aranclanos
722e0ef6e1 Merge pull request #5244 from Lo6a4evskiy/Pocket_runtime_fix
Fixed stripping items from pockets runtime
2014-10-15 10:52:09 -03:00
Aranclanos
a31b372ea7 Merge pull request #5171 from phil235/ed209fix
A lot of secbot/ed-209 fixes.
2014-10-15 10:42:30 -03:00
Remie Richards
89a13aeccc Merge pull request #5219 from phil235/robotaccesspdafix
Cyborgs can now be unlocked by pda with ID inside
2014-10-15 11:56:28 +01:00
paprka
69bbeb6815 underwear updates 2014-10-14 15:02:06 -07:00
Lo6a4evskiy
3d8bbbbd77 Fixed runtime 2014-10-14 12:27:05 +04:00
Remie Richards
2cf207baf3 No leaping while leaping, pure logic. 2014-10-13 18:36:03 +01:00
Remie Richards
07aaac17d0 Fixes runtimes with Hulks and Simple animals, Simplifies throw_impact code for leaping xenos 2014-10-13 18:00:56 +01:00
Remie Richards
6df292dfc6 Merge pull request #5178 from phil235/IanFoodFix
Fix for #4754
2014-10-13 11:43:51 +01:00
phil235
2f80549db4 Fixing issue with cyborgs not being unlockable with pda (with ID inside). Ported the fix from NTstation. 2014-10-12 20:14:52 +02:00
Remie Richards
9d1fa90b04 Added WJ's "pounce" sprites, these show the Xeno is ready to leap
Added WJ's leap+pounce sprites for Sentinels and Drones just because
2014-10-12 18:20:29 +01:00
JJRcop
8c30ad07b6 More drone tweaks:
Drones can now be repaired by a screwdriver after an 8 second delay
Drones now repair to a health_repair_max instead of maxHealth that defaults to their initial health
Drones can now use the strip panel
Added child_override var to simple_animal/stripPanel(Un)Equip that calls the parent if true
2014-10-11 15:48:51 -04:00
Remie Richards
f673093ee5 Merge pull request #5135 from paprka/undershirtstake2
Undershirts and jumpsuit overhaul
2014-10-11 20:02:55 +01: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
Incoming
6a157216f9 Fixes undershirts to play nice with female uniforms.
Generalizes and renames some things with female uniforms now that they're used for undershirts too
2014-10-11 13:09:52 -04:00
Remie Richards
c0457b05cc Removal of commented code 2014-10-11 17:52:34 +01:00
Remie Richards
5a05a16531 Alien stunning is no longer custom, it uses weakened, weakened has been *slightly* tweaked
Aliens cannot leap if the thing they leap at has no gravity, or if they them selves have no gravity
2014-10-11 17:46:18 +01:00
JJRcop
1e51b88c5f Drone tweaks
Drones can hear and understand human speech, but still cannot speak it
Drones recieve 25 brute damage when hit by a heavy EMP blast
You can tell if drones do not have a player controlling them
If you attempt to repair a dead drone, but the player is ghosted and can re-enter, you will repair it, and the ghost will be notified
Added new get_ghost proc to mobs, which will attempt to retrieve the ghost mob of the player if it exists and can re-enter, override arg available if you want it even if it can't re-enter
Syndrones now start with initial TC/2 instead of a hard coded 5 (which was made before the TC*2 update)
Drones get a robotic chat bubble
2014-10-11 01:13:51 -04:00
Remie Richards
d9dd60418d Alien hunters can now leap, Hitting a mob stuns it, Hitting anything dense stuns the alien for a short time 2014-10-11 02:40:27 +01:00
phil235
ec3c50b4c2 Prevent corgis from eating food through windows, and cats from splatting mice through windows. Also fixing cat emote for splatting mouse. 2014-10-10 21:19:43 +02:00
phil235
5fadf38aa6 Merge branch 'master' of https://github.com/tgstation/-tg-station into ed209fix
Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/secbot.dm
2014-10-10 17:12:05 +02:00
hornygranny
c55480af16 Merge pull request #5100 from Lo6a4evskiy/Armor_stripping_delay
Stripping delay adjustments
2014-10-09 13:46:59 -07:00
Remie Richards
438e45b5fc Drones are now picked up instantly, Drones escaping form someone's hands takes 5 seconds. 2014-10-09 21:30:15 +01:00
hornygranny
30b3294adc Merge pull request #5123 from paprka/zippycuffs
Adds zipties
2014-10-08 21:12:05 -07:00
paprka
149c9a3a76 big update 2014-10-08 20:58:43 -07:00
Francis Devine
5595d57f57 Add the click cooldown define to the last special defines
This will stop these getting out of sync and let you change
all times with a single define
2014-10-09 14:52:47 +13:00
Francis Devine
f737f7889c Defines for the define god 2014-10-09 14:49:28 +13:00
Francis Devine
970c61844f Cleaning up unecessary cooldown changes 2014-10-09 14:49:28 +13: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
paprka
d61e4ac943 big commit, handcuff overhaul 2014-10-08 13:19:54 -07:00
paprka
67dd029fe0 updated sprites, grey stuff 2014-10-08 10:38:24 -07:00
paprka
b8eb9e3587 general code optimizations 2014-10-08 10:10:03 -07:00
paprka
18108257ae Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2
Conflicts:
	code/__HELPERS/mobs.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/mob/new_player/sprite_accessories.dm
2014-10-08 09:48:49 -07:00
paprka
668bb52a1e Merge branch 'master' of https://github.com/tgstation/-tg-station into zippycuffs
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
2014-10-08 07:17:42 -07:00
paprka
8f9dfe0c5b code optimizations (thanks remie) 2014-10-08 07:12:00 -07:00
Lo6a4evskiy
98e04ca52e Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay
Conflicts:
	code/modules/clothing/spacesuits/miscellaneous.dm
2014-10-08 16:45:22 +04: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