Commit Graph

3141 Commits

Author SHA1 Message Date
Hornygranny
72a8a82c7e Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity
Conflicts:
	code/modules/mob/living/living.dm
2014-10-22 13:26:35 -07:00
hornygranny
16d299e5c5 Merge pull request #5379 from optimumtact/revertclick
Revert my click cooldown changes
2014-10-21 18:39:21 -07:00
phil235
56c853f9d6 Merge branch 'master' of https://github.com/tgstation/-tg-station into bodybagfix1
Conflicts:
	code/modules/mob/living/simple_animal/friendly/mouse.dm
2014-10-21 15:58:39 +02:00
hornygranny
1c9c6d5950 Merge pull request #5249 from phil235/DisplacedGirderFix
Fix for #4602
2014-10-20 20:18:06 -07:00
hornygranny
afe171bb0a Merge pull request #5313 from TZK13/Preferences-Setup-Fixes
Fixes the previews in the character setup screen
2014-10-20 19:32:48 -07:00
hornygranny
d74690a7bf Merge pull request #5308 from Menshin/radiation_decreasing_fix
Fixes radiation levels getting stuck
2014-10-20 19:20:19 -07:00
hornygranny
18c669a4fc Merge pull request #5364 from JJRcop/Reactivated-drones-still-in-dead-mob-list
Fixes a bug with reactivated drones not being removed from the dead_mob_list
2014-10-20 19:19:45 -07:00
Hornygranny
3f095fb39f lol forgot to save all 2014-10-20 17:16:39 -07:00
Hornygranny
386972886b fixes 2014-10-20 16:55:02 -07:00
Hornygranny
e5e6ded884 singularity is now OOP 2014-10-20 16:36:00 -07:00
Francis
adf252df9b Keep the define around as that is a good idea 2014-10-20 22:49:06 +13:00
Francis
25d587a483 Revert "Cleaning up unecessary cooldown changes"
This reverts commit 970c61844f.
2014-10-20 22:22:51 +13:00
Francis
b3de61552f Revert "Defines for the define god"
This reverts commit f737f7889c.
2014-10-20 22:22:38 +13:00
Francis
c50c26a48f Revert "Add the click cooldown define to the last special defines"
This reverts commit 5595d57f57.
2014-10-20 22:22:23 +13:00
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
JJRcop
86287072ec Fixes a bug when reactivating drones where they wouldn't be removed from the dead_mob_list 2014-10-19 18:15:18 -04: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
TZK13
4c5dcb4ae9 Changes the preview satchel for the CMO, MD and virologist from norm to med. 2014-10-18 04:55:40 -05:00
TZK13
3cff2fcbdd Fixes the previews in the character setup screen. 2014-10-18 04:30:10 -05:00
Menshin
98a7b97377 Fixes radiation levels getting stuck between 0-1, 49-50 and 75-76 (fixes #5304) 2014-10-18 01:10: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
phil235
45cfe07f98 Merge branch 'master' of https://github.com/tgstation/-tg-station into DisplacedGirderFix
Conflicts:
	code/modules/recycling/disposal.dm
2014-10-15 18:23:40 +02:00
phil235
dbea503e88 Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere.
Fixing one instance of "for(mob in viewers) show_message()" to "visible_message()"
2014-10-15 18:03:06 +02: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
phil235
f4f716c3a7 Adding a CanPass() proc to girders. Projectiles can now sometimes pass through them, with varying percentage chance depending on girder subtypes.
Fixing reinforced and disloged girders being called "reinforced" or "disloged" upon examination instead of "disloged girder" and "reinforced girder".
Adding passtable and passgrille to mice for consistency, because chicks already have those flags.
2014-10-14 17:56:48 +02: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
phil235
cd78c2b067 Adding puppies and kittens to the small mob category.
Increasing mob_storage_capacity for closet and bodybag to 4 and 6 respectively.
2014-10-13 19:03:56 +02: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
phil235
36cbf06ed9 closets and its children can no longer contain a near infinite amount of mobs.
Adding a mob_size var to mob/living . All closets can still contain the same amount of small sized mobs as before(mouse, parrot,pAI, viscerator, lizard, chick), but they can no longer contain large mobs (alien emperess, blobbernaut, juggernaut, hostile tree, goliath), and they can contain a few human sized mobs (three for bodybags, two for closets and other children).
2014-10-12 18:46:56 +02: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